Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/initscripts-alx/patches/initscripts-0.3.4-r10-alx-hwdetect-use-cvt-and-sync-with-alxconfig-ng.patch

    Annotation of /trunk/initscripts-alx/patches/initscripts-0.3.4-r10-alx-hwdetect-use-cvt-and-sync-with-alxconfig-ng.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1206 - (hide annotations) (download)
    Fri Nov 26 12:25:13 2010 UTC (13 years, 6 months ago) by niro
    File size: 4723 byte(s) 
    fixed a typo and renamed patch
    1 niro 1206 diff -Naur magellan-initscripts/etc/rc.d/init.d/hwdetect magellan-initscripts-fixed/etc/rc.d/init.d/hwdetect
    2     --- magellan-initscripts/etc/rc.d/init.d/hwdetect 2005-08-31 23:46:24.000000000 +0200
    3     +++ magellan-initscripts-fixed/etc/rc.d/init.d/hwdetect 2010-11-26 13:34:19.000000000 +0100
    4     @@ -21,19 +21,12 @@
    5     xserver="$(readlink /usr/X11R6/bin/X)"
    6    
    7     case ${xserver} in
    8     - Xorg)
    9     - xfconfig=/etc/X11/xorg.conf
    10     - ;;
    11     - XFree86)
    12     - xfconfig=/etc/X11/XF86Config
    13     - ;;
    14     - *)
    15     - echo " Unkown xserver. aborting."
    16     - exit 1
    17     - ;;
    18     + Xorg) xfconfig=/etc/X11/xorg.conf;;
    19     + XFree86) xfconfig=/etc/X11/XF86Config;;
    20     + *) echo " Unkown xserver. aborting."; exit 1 ;;
    21     esac
    22    
    23     - # have we vnc support ?
    24     + # got we vnc support ?
    25     if [ -f /usr/X11R6/lib/modules/vnc.so ] || \
    26     [ -f /usr/X11R6/lib/modules/extensions/vnc.so ]
    27     then
    28     @@ -65,10 +58,7 @@
    29     echo ' SubSection "extmod"' >> ${xfconfig}
    30     echo ' Option "omit xfree86-dga"' >> ${xfconfig}
    31     echo ' EndSubSection' >> ${xfconfig}
    32     - echo ' Load "type1"' >> ${xfconfig}
    33     - echo ' Load "speedo"' >> ${xfconfig}
    34     echo ' Load "freetype"' >> ${xfconfig}
    35     - echo '# Load "xtt"' >> ${xfconfig}
    36     echo '# Load "glx"' >> ${xfconfig}
    37     echo ' Load "dri"' >> ${xfconfig}
    38    
    39     @@ -80,7 +70,6 @@
    40     # fonts
    41     echo '' >> ${xfconfig}
    42     echo 'Section "Files"' >> ${xfconfig}
    43     - echo ' RgbPath "/usr/X11R6/lib/X11/rgb"' >> ${xfconfig}
    44    
    45     case ${xserver} in
    46     Xorg)
    47     @@ -88,9 +77,6 @@
    48     echo ' FontPath "/usr/share/fonts/misc/"' >> ${xfconfig}
    49     echo ' FontPath "/usr/share/fonts/75dpi/:unscaled"' >> ${xfconfig}
    50     echo ' FontPath "/usr/share/fonts/100dpi/:unscaled"' >> ${xfconfig}
    51     - echo ' #prevents slow startup when disabled -> speedo, type1' >> ${xfconfig}
    52     - echo ' #FontPath "/usr/share/fonts/Speedo/"' >> ${xfconfig}
    53     - echo ' #FontPath "/usr/share/fonts/Type1/"' >> ${xfconfig}
    54     echo ' FontPath "/usr/share/fonts/TrueType/"' >> ${xfconfig}
    55     echo ' FontPath "/usr/share/fonts/freefont/"' >> ${xfconfig}
    56     echo ' FontPath "/usr/share/fonts/75dpi/"' >> ${xfconfig}
    57     @@ -101,9 +87,6 @@
    58     echo ' FontPath "/usr/X11R6/lib/X11/fonts/misc/"' >> ${xfconfig}
    59     echo ' FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"' >> ${xfconfig}
    60     echo ' FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"' >> ${xfconfig}
    61     - echo ' #prevents slow startup when disabled -> speedo, type1' >> ${xfconfig}
    62     - echo ' #FontPath "/usr/X11R6/lib/X11/fonts/Speedo/"' >> ${xfconfig}
    63     - echo ' #FontPath "/usr/X11R6/lib/X11/fonts/Type1/"' >> ${xfconfig}
    64     echo ' FontPath "/usr/X11R6/lib/X11/fonts/TrueType/"' >> ${xfconfig}
    65     echo ' FontPath "/usr/X11R6/lib/X11/fonts/freefont/"' >> ${xfconfig}
    66     echo ' FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"' >> ${xfconfig}
    67     @@ -111,7 +94,6 @@
    68     ;;
    69     esac
    70    
    71     - echo '# ModulePath "/usr/X11R6/lib/modules"' >> ${xfconfig}
    72     echo 'EndSection' >> ${xfconfig}
    73    
    74    
    75     @@ -130,24 +112,16 @@
    76     echo ' Identifier "Keyboard1"' >> ${xfconfig}
    77    
    78     case ${xserver} in
    79     - Xorg)
    80     - echo ' Driver "kbd"' >> ${xfconfig}
    81     - ;;
    82     - XFree86)
    83     - echo ' Driver "Keyboard"' >> ${xfconfig}
    84     - ;;
    85     + Xorg) echo ' Driver "kbd"' >> ${xfconfig} ;;
    86     + XFree86) echo ' Driver "Keyboard"' >> ${xfconfig} ;;
    87     esac
    88    
    89     echo ' Option "AutoRepeat" "500 30"' >> ${xfconfig}
    90     echo '# Option "Xleds" "1 2 3"' >> ${xfconfig}
    91    
    92     case ${xserver} in
    93     - Xorg)
    94     - echo ' Option "XkbRules" "xorg"' >> ${xfconfig}
    95     - ;;
    96     - XFree86)
    97     - echo ' Option "XkbRules" "xfree86"' >> ${xfconfig}
    98     - ;;
    99     + Xorg) echo ' Option "XkbRules" "xorg"' >> ${xfconfig} ;;
    100     + XFree86) echo ' Option "XkbRules" "xfree86"' >> ${xfconfig} ;;
    101     esac
    102    
    103     echo ' Option "XkbModel" "pc104"' >> ${xfconfig}
    104     @@ -248,6 +222,17 @@
    105     if [ -x "/sbin/ddcxinfo-knoppix" ]
    106     then
    107     ddcxinfo-knoppix -monitor >> ${xfconfig}
    108     +
    109     + # try cvt
    110     + elif [ -x "/usr/X11R6/bin/cvt" ]
    111     + then
    112     + local modeline="$(/usr/X11R6/bin/cvt 1024 767 60 | sed -e 's:^:\t:g' -e 's:_.*\":\":')"
    113     + echo 'Section "Monitor"' >> ${xfconfig}
    114     + echo ' Identifier "mon0"' >> ${xfconfig}
    115     + echo ' Option "DPMS"' >> ${xfconfig}
    116     + echo "${modeline}" >> ${xfconfig}
    117     + echo 'EndSection' >> ${xfconfig}
    118     +
    119     else
    120     # some conservative default values
    121     echo 'Section "Monitor"' >> ${xfconfig}
    122     @@ -359,9 +344,9 @@
    123    
    124     # dri (here disabled, use default of xserver)
    125     echo '' >> ${xfconfig}
    126     - echo '# Section "DRI"' >> ${xfconfig}
    127     - echo '# Mode 0666' >> ${xfconfig}
    128     - echo '# EndSection' >> ${xfconfig}
    129     + echo 'Section "DRI"' >> ${xfconfig}
    130     + echo ' Mode 0666' >> ${xfconfig}
    131     + echo 'EndSection' >> ${xfconfig}
    132     }
    133    
    134