Changeset 709

Show
Ignore:
Timestamp:
07/19/08 09:19:47 (1 month ago)
Author:
free
Message:

. added MIT-SHM option to trinity xorg.conf

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • cdd-utils/trunk/debian/changelog

    r703 r709  
    1 cdd-utils (0.12.11) 64studio; urgency=low 
     1cdd-utils (0.12.12) 64studio; urgency=low 
    22 
    33  * [lib]: 
     
    1111        . allow root login in kdm 
    1212        . added model support to touchscreen 
     13        . added MIT-SHM option to trinity xorg.conf 
    1314     - server 
    1415        . add cups script for sharing printers with samba 
  • cdd-utils/trunk/lib/desktop.sh

    r703 r709  
    194194EOF 
    195195 
    196 #    perl -e 'open(FILE, "/etc/X11/xorg.conf"); while ($line = <FILE>) {if ($line =~ /^Section "Extensions"/) {$buffer = $line;$flag = 0;until ($line =~ /^EndSection/) {$line = <FILE>; $buffer .= $line; if ($line =~ /^.*Option "MIT-SHM"/) {$flag = 1;};}; if ($flag == 0) {print $buffer;};} else {print "$line";};};close(FILE);'> $cfg.tmp 
    197 #    mv $cfg.tmp $cfg 
    198 #    if [ -z "$(tail -1 $cfg)" ]; then 
    199 #     sed '$d' < $cfg > $cfg.tmp 
    200 #     mv $cfg.tmp $cfg 
    201 #    fi 
    202  
    203 #    cat <<EOF >> $cfg 
    204 #Section "Extensions" 
    205 #       Option "MIT-SHM" "no" 
    206 #EndSection 
    207 #EOF 
     196    perl -e 'open(FILE, "/etc/X11/xorg.conf"); while ($line = <FILE>) {if ($line =~ /^Section "Extensions"/) {$buffer = $line;$flag = 0;until ($line =~ /^EndSection/) {$line = <FILE>; $buffer .= $line; if ($line =~ /^.*Option "MIT-SHM"/) {$flag = 1;};}; if ($flag == 0) {print $buffer;};} else {print "$line";};};close(FILE);'> $cfg.tmp 
     197    mv $cfg.tmp $cfg 
     198    if [ -z "$(tail -1 $cfg)" ]; then 
     199      sed '$d' < $cfg > $cfg.tmp 
     200      mv $cfg.tmp $cfg 
     201    fi 
     202 
     203    cat <<EOF >> $cfg 
     204Section "Extensions" 
     205       Option "MIT-SHM" "no" 
     206EndSection 
     207EOF 
    208208 
    209209}