Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/magellan-initscripts/etc/rc.d/init.d/hwdetect

    Diff of /trunk/magellan-initscripts/etc/rc.d/init.d/hwdetect

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 11 by niro, Mon Dec 13 23:30:33 2004 UTC revision 707 by niro, Thu Apr 10 20:26:46 2008 UTC
    # Line 1  Line 1 
    1  #!/bin/bash  #!/bin/bash
    2    # $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/hwdetect,v 1.7 2008-04-10 20:26:46 niro Exp $
    3    
    4  # note: must be startet before /etc/rc.d/init.d/modules !!!  # note: must be startet before /etc/rc.d/init.d/modules !!!
    5    
    # Line 11  Line 12 
    12  #%before:  #%before:
    13  #%after:  #%after:
    14    
    15  write_x11_config() {  add_x11conf()
    16    {
    17     local var="$1"
    18     echo "${var}" >> ${xfconfig} || die "add_x11conf() adding \$var"
    19    }
    20    
    21    add_modconf()
    22    {
    23     local var="$1"
    24     local config
    25    
    26     # get the right config
    27     if [[ -f /etc/modules.autoload ]]
    28     then
    29     config=/etc/modules.autoload
    30     else
    31     config=/etc/modules.autoload.d/kernel-$(kernel_major_version)
    32     fi
    33    
    34     echo "${var}" >> ${config}
    35    }
    36    
    37    write_x11_config()
    38    {
    39   local xserver   local xserver
    40   local xfconfig   local xfconfig
    41    
    42   local HAS_VNC   local HAS_VNC
    43     local USE_AIGLX
    44   #xfree or xorg ?  
    45     local rgbpath
    46     local fontpath
    47     local modulespath
    48     local i
    49    
    50     # check command line for params
    51     for i in $(cat /proc/cmdline)
    52     do
    53     case "${i}" in
    54     aiglx) USE_AIGLX=yes;;
    55     esac
    56     done
    57    
    58     # xfree or xorg ?
    59   xserver="$(readlink /usr/X11R6/bin/X)"   xserver="$(readlink /usr/X11R6/bin/X)"
    60    
    61   case ${xserver} in   case ${xserver} in
    # Line 32  write_x11_config() { Line 70  write_x11_config() {
    70   exit 1   exit 1
    71   ;;   ;;
    72   esac   esac
    73    
    74   #got we vnc support ?   # have we vnc support ?
    75   if [ -f /usr/X11R6/lib/modules/vnc.so ]   if [[ -f /usr/X11R6/lib/modules/vnc.so ]] ||
    76     [[ -f /usr/X11R6/lib/modules/extensions/vnc.so ]] ||
    77     [[ -f /usr/lib/xorg/modules/extensions/vnc.so ]]
    78   then   then
    79   HAS_VNC="yes"   HAS_VNC="yes"
    80   else   else
    81   HAS_VNC="no"   HAS_VNC="no"
    82   fi   fi
    83    
    84     # show which xserver we going to use
      #show which server we use  
    85   echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "   echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "
    86    
    87   #show if we have vnc   # show if we have vnc
    88   if [ "${HAS_VNC}" = "yes" ]   if [[ ${HAS_VNC} = yes ]]
    89   then   then
    90   echo "with vnc enabled ..."   echo "with vnc enabled ..."
    91   else   else
    92   echo "..."   echo "..."
    93   fi   fi
    94    
    95   #create a new clear xfconfig file   # create a new clear xfconfig file
    96   echo '# Generated with hwdetect, part of Magellan-Linux initscripts.' > ${xfconfig}   echo '# Generated with hwdetect, part of Magellan-Linux initscripts.' > ${xfconfig}
    97   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    98    
    99   #write modules  
    100   echo '' >> ${xfconfig}   # write modules
    101   echo 'Section "Module"' >> ${xfconfig}   add_x11conf ''
    102   echo '    Load        "dbe"' >> ${xfconfig}   add_x11conf 'Section "Module"'
    103   echo '    SubSection  "extmod"' >> ${xfconfig}   add_x11conf '    Load        "dbe"'
    104   echo '      Option    "omit xfree86-dga"' >> ${xfconfig}   add_x11conf '    SubSection  "extmod"'
    105   echo '    EndSubSection' >> ${xfconfig}   add_x11conf '      Option    "omit xfree86-dga"'
    106   echo '    Load        "type1"' >> ${xfconfig}   add_x11conf '    EndSubSection'
    107   echo '    Load        "speedo"' >> ${xfconfig}   add_x11conf '    Load        "type1"'
    108   echo '    Load        "freetype"' >> ${xfconfig}   add_x11conf '    Load        "speedo"'
    109   echo '#    Load        "xtt"' >> ${xfconfig}   add_x11conf '    Load        "freetype"'
    110   echo '#    Load       "glx"' >> ${xfconfig}   add_x11conf '#    Load        "xtt"'
    111   echo '    Load       "dri"' >> ${xfconfig}   if [[ ${USE_AIGLX} = yes ]]
    112     then
    113   [ "${HAS_VNC}" = "yes" ] && echo '    Load       "vnc"' >> ${xfconfig}   add_x11conf '     Load       "glx"'
    114     else
    115   echo 'EndSection' >> ${xfconfig}   add_x11conf '#    Load       "glx"'
    116     fi
    117     add_x11conf '    Load       "dri"'
    118   #fonts  
    119   echo '' >> ${xfconfig}   [[ ${HAS_VNC} = yes ]] && add_x11conf '    Load       "vnc"'
    120   echo 'Section "Files"' >> ${xfconfig}  
    121   echo '    RgbPath "/usr/X11R6/lib/X11/rgb"' >> ${xfconfig}   add_x11conf 'EndSection'
    122    
    123     # enable composite for aiglx
    124     if [[ ${USE_AIGLX} = yes ]]
    125     then
    126     add_x11conf 'Section "Extensions"'
    127     add_x11conf '    Option     "Composite"      "Enable"'
    128     add_x11conf 'EndSection'
    129     fi
    130    
    131    
    132     # fonts
    133   case ${xserver} in   case ${xserver} in
    134   Xorg)   Xorg)
    135   echo '    FontPath   "/usr/share/fonts/local/"' >> ${xfconfig}   fontpath="/usr/share/fonts"
    136   echo '    FontPath   "/usr/share/fonts/misc/"' >> ${xfconfig}   rgbpath="/usr/share/X11"
    137   echo '    FontPath   "/usr/share/fonts/75dpi/:unscaled"' >> ${xfconfig}   modulespath="/usr/lib/xorg/modules"
      echo '    FontPath   "/usr/share/fonts/100dpi/:unscaled"' >> ${xfconfig}  
      echo '    #prevents slow startup when disabled -> speedo, type1' >> ${xfconfig}  
      echo '    #FontPath   "/usr/share/fonts/Speedo/"' >> ${xfconfig}  
      echo '    #FontPath   "/usr/share/fonts/Type1/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/share/fonts/TrueType/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/share/fonts/freefont/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/share/fonts/75dpi/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/share/fonts/100dpi/"' >> ${xfconfig}  
    138   ;;   ;;
    139   XFree86)   XFree86)
    140   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/local/"' >> ${xfconfig}   fontpath="/usr/X11R6/lib/X11/fonts"
    141   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/misc/"' >> ${xfconfig}   rgbpath="/usr/X11R6/lib/X11"
    142   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"' >> ${xfconfig}   modulespath="/usr/X11R6/lib/modules"
      echo '    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"' >> ${xfconfig}  
      echo '    #prevents slow startup when disabled -> speedo, type1' >> ${xfconfig}  
      echo '    #FontPath   "/usr/X11R6/lib/X11/fonts/Speedo/"' >> ${xfconfig}  
      echo '    #FontPath   "/usr/X11R6/lib/X11/fonts/Type1/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/X11R6/lib/X11/fonts/TrueType/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/X11R6/lib/X11/fonts/freefont/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/"' >> ${xfconfig}  
    143   ;;   ;;
    144   esac   esac
    145    
    146   echo '#    ModulePath "/usr/X11R6/lib/modules"' >> ${xfconfig}   add_x11conf ''
    147   echo 'EndSection' >> ${xfconfig}   add_x11conf 'Section "Files"'
    148     add_x11conf "    RgbPath    \"${rgbpath}/rgb\""
    149     add_x11conf "    FontPath   \"${fontpath}/local/\""
    150   #server flags   add_x11conf "    FontPath   \"${fontpath}/misc/\""
    151   echo '' >> ${xfconfig}   add_x11conf "    FontPath   \"${fontpath}/75dpi/:unscaled\""
    152   echo 'Section "ServerFlags"' >> ${xfconfig}   add_x11conf "    FontPath   \"${fontpath}/100dpi/:unscaled\""
    153   echo '#    Option "DontVTSwitch"' >> ${xfconfig}   add_x11conf '    #prevents slow startup when disabled -> speedo, type1'
    154   echo '#    Option "DontZap"' >> ${xfconfig}   add_x11conf "    #FontPath  \"${fontpath}/Speedo/\""
    155   echo '#    Option "Dont Zoom"' >> ${xfconfig}   add_x11conf "    #FontPath  \"${fontpath}/fonts/Type1/\""
    156   echo 'EndSection' >> ${xfconfig}   add_x11conf "    FontPath   \"${fontpath}/fonts/TrueType/\""
    157     add_x11conf "    FontPath   \"${fontpath}/freefont/\""
    158     add_x11conf "    FontPath   \"${fontpath}/75dpi/\""
    159   #keyboard   add_x11conf "    FontPath   \"${fontpath}/100dpi/\""
    160   echo '' >> ${xfconfig}   add_x11conf "#    ModulePath \"${modulespath}\""
    161   echo 'Section "InputDevice"' >> ${xfconfig}   add_x11conf 'EndSection'
    162   echo '    Identifier "Keyboard1"' >> ${xfconfig}  
    163     # xserver flags
    164     add_x11conf ''
    165     add_x11conf 'Section "ServerFlags"'
    166     add_x11conf '#    Option "DontVTSwitch"'
    167     add_x11conf '#    Option "DontZap"'
    168     add_x11conf '#    Option "Dont Zoom"'
    169     add_x11conf 'EndSection'
    170    
    171    
    172     # keyboard
    173     add_x11conf ''
    174     add_x11conf 'Section "InputDevice"'
    175     add_x11conf '    Identifier "Keyboard1"'
    176    
    177   case ${xserver} in   case ${xserver} in
    178   Xorg)   Xorg) add_x11conf '    Driver "kbd"' ;;
    179   echo '    Driver "kbd"' >> ${xfconfig}   XFree86) add_x11conf '    Driver "Keyboard"' ;;
      ;;  
      XFree86)  
      echo '    Driver "Keyboard"' >> ${xfconfig}  
      ;;  
    180   esac   esac
    181    
    182   echo '    Option "AutoRepeat" "500 30"' >> ${xfconfig}   add_x11conf '    Option "AutoRepeat" "500 30"'
    183   echo '#    Option "Xleds"      "1 2 3"' >> ${xfconfig}   add_x11conf '#    Option "Xleds"      "1 2 3"'
    184    
    185   case ${xserver} in   case ${xserver} in
    186   Xorg)   Xorg)
    187   echo '    Option "XkbRules" "xorg"' >> ${xfconfig}   add_x11conf '    Option "XkbRules" "xorg"'
    188   ;;   ;;
    189   XFree86)   XFree86)
    190   echo '    Option "XkbRules" "xfree86"' >> ${xfconfig}   add_x11conf '    Option "XkbRules" "xfree86"'
    191   ;;   ;;
    192   esac   esac
    193    
    194   echo '    Option "XkbModel" "pc104"' >> ${xfconfig}   add_x11conf '    Option "XkbModel" "pc104"'
    195   echo '    Option "XkbLayout" "de"' >> ${xfconfig}   add_x11conf '    Option "XkbLayout" "de"'
    196   echo 'EndSection' >> ${xfconfig}   add_x11conf 'EndSection'
    197    
    198    
    199   #mouse   # mouse
    200   #to be safe   # to be safe
    201   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    202   #get config   # get config
    203   [ -f /etc/sysconfig/hwsetup/mouse ] && source /etc/sysconfig/hwsetup/mouse   [ -f /etc/sysconfig/hwsetup/mouse ] && source /etc/sysconfig/hwsetup/mouse
    204    
    205   echo '' >> ${xfconfig}   add_x11conf ''
    206   echo 'Section "InputDevice"' >> ${xfconfig}   add_x11conf 'Section "InputDevice"'
    207   echo '    Identifier "Mouse1"' >> ${xfconfig}   add_x11conf '    Identifier "Mouse1"'
    208   echo '    Driver "mouse"' >> ${xfconfig}   add_x11conf '    Driver "mouse"'
    209    
    210   if [ -n "${XMOUSETYPE}" ]   if [[ -n ${XMOUSETYPE} ]]
    211   then   then
    212   echo "    Option \"Protocol\"    \"${XMOUSETYPE}\"" >> ${xfconfig}   add_x11conf "    Option \"Protocol\"    \"${XMOUSETYPE}\""
    213   else   else
    214   echo '    Option "Protocol"    "PS/2"' >> ${xfconfig}   add_x11conf '    Option "Protocol"    "PS/2"'
    215   fi   fi
    216    
    217   if [ -n "${DEVICE}" ]   if [[ -n ${DEVICE} ]]
    218   then   then
    219   #show what we got   # show what we got
    220   echo -e ${COLOREDSTAR}"Mouse (${MOUSE_FULLNAME} found at ${MOUSE_DEVICE}"   echo -e ${COLOREDSTAR}"Mouse (${MOUSE_FULLNAME} found at ${MOUSE_DEVICE}"
    221    
    222   #is there any mouse module than try to load it   # is there any mouse module than try to load it
    223   if [ "${MOUSETYPE}" = "ps2" ]   if [[ ${MOUSETYPE} = ps2 ]]
    224   then   then
    225   #kernel 2.6   # kernel 2.6
    226   if [ -f /lib/modules/$(uname -r)/kernel/drivers/input/mouse/psmouse.ko ]   if [ -f /lib/modules/$(uname -r)/kernel/drivers/input/mouse/psmouse.ko ]
    227   then   then
    228   echo -e ${COLOREDSTAR}"Loading kernel-module 'psmouse' ..."   echo -e ${COLOREDSTAR}"Loading kernel-module 'psmouse' ..."
    229   echo "psmouse" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)   add_modconf 'psmouse'
    230   fi   fi
    231    
    232   #kernel 2.4   # kernel 2.4
    233   #if [ -f /lib/modules/$(uname -r)/kernel/drivers/input/mouse/psmouse.ko ]   #if [ -f /lib/modules/$(uname -r)/kernel/drivers/input/mouse/psmouse.ko ]
    234   #then   #then
    235   # echo -e ${COLOREDSTAR}"Loading kernel-module 'psmouse' ..."   # echo -e ${COLOREDSTAR}"Loading kernel-module 'psmouse' ..."
    236   # echo "psmouse" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)   # echo "psmouse" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)
    237   #fi   #fi
    238   else   else
    239   #kernel 2.6   # kernel 2.6
    240   if [ -a /lib/modules/$(uname -r)/kernel/drivers/input/mouse/sermouse.ko ]   if [ -a /lib/modules/$(uname -r)/kernel/drivers/input/mouse/sermouse.ko ]
    241   then   then
    242   echo -e ${COLOREDSTAR}"Loading kernel-module 'sermouse' ..."   echo -e ${COLOREDSTAR}"Loading kernel-module 'sermouse' ..."
    243   echo "sermouse" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)   add_modconf 'sermouse'
    244   fi   fi
    245    
    246   #kernel 2.4   # kernel 2.4
    247   #if [ -f /lib/modules/$(uname -r)/kernel/drivers/input/mouse/psmouse.ko ]   #if [ -f /lib/modules/$(uname -r)/kernel/drivers/input/mouse/psmouse.ko ]
    248   #then   #then
    249   # echo -e ${COLOREDSTAR}"Loading kernel-module 'psmouse' ..."   # echo -e ${COLOREDSTAR}"Loading kernel-module 'psmouse' ..."
    250   # echo "psmouse" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)   # echo "psmouse" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)
    251   #fi   #fi
    252   fi   fi
    253   echo "    Option \"Device\"      \"${DEVICE}\"" >> ${xfconfig}   add_x11conf "    Option \"Device\"      \"${DEVICE}\""
    254   else   else
    255   echo '    Option "Device"      "/dev/mouse"' >> ${xfconfig}   add_x11conf '    Option "Device"      "/dev/mouse"'
    256   fi   fi
    257    
    258   echo '    Option "Resolution" "1200"' >> ${xfconfig}   add_x11conf '    Option "Resolution" "1200"'
    259    
    260   [ "${XMOUSETYPE}" = "IMPS/2" ] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}   [[ ${XMOUSETYPE} = IMPS/2 ]] && add_x11conf '    Option "ZAxisMapping" "4 5"'
    261    
    262   echo 'EndSection' >> ${xfconfig}   add_x11conf 'EndSection'
    263    
    264   #to be safe   # to be safe
    265   unset MOUSETYPE XMOUSETYPE FULLNAME DEVICE   unset MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    266    
    267    
    268   #vnc keyboard && mouse   # vnc keyboard && mouse
    269   if [ "${HAS_VNC}" = "yes" ]   if [[ ${HAS_VNC} = yes ]]
    270   then   then
    271   echo '' >> ${xfconfig}   add_x11conf ''
    272   echo 'Section "InputDevice"' >> ${xfconfig}   add_x11conf 'Section "InputDevice"'
    273   echo '    Identifier "vncKeyboard"' >> ${xfconfig}   add_x11conf '    Identifier "vncKeyboard"'
    274   echo '    Driver "rfbkeyb"' >> ${xfconfig}   add_x11conf '    Driver "rfbkeyb"'
    275   echo 'EndSection' >> ${xfconfig}   add_x11conf 'EndSection'
    276    
    277   echo '' >> ${xfconfig}   add_x11conf ''
    278   echo 'Section "InputDevice"' >> ${xfconfig}   add_x11conf 'Section "InputDevice"'
    279   echo '    Identifier "vncMouse"' >> ${xfconfig}   add_x11conf '    Identifier "vncMouse"'
    280   echo '    Driver "rfbmouse"' >> ${xfconfig}   add_x11conf '    Driver "rfbmouse"'
    281   echo 'EndSection' >> ${xfconfig}   add_x11conf 'EndSection'
    282   fi   fi
    283    
       
      #monitor  
      echo '' >> ${xfconfig}  
     # echo 'Section "Monitor"' >> ${xfconfig}  
     # echo '    Identifier  "mon0"' >> ${xfconfig}  
     # echo '    HorizSync   28 - 96' >> ${xfconfig}  
     # echo '    VertRefresh 50-60' >> ${xfconfig}  
     # echo '    Option      "DPMS"' >> ${xfconfig}  
     # echo 'EndSection' >> ${xfconfig}  
    284    
    285   #test; using knoppix ddcxinfo   # monitor
    286   if [ -x "/sbin/ddcxinfo-knoppix" ]   add_x11conf ''
    287    
    288     # using knoppix ddcxinfo
    289     if [[ -x /sbin/ddcxinfo-knoppix ]]
    290   then   then
    291   ddcxinfo-knoppix -monitor >> ${xfconfig}   ddcxinfo-knoppix -monitor >> ${xfconfig}
    292   else   else
    293   #some conservative default values   # some conservative default values
    294   echo 'Section "Monitor"' >> ${xfconfig}   add_x11conf 'Section "Monitor"'
    295   echo '    Identifier  "mon0"' >> ${xfconfig}   add_x11conf '    Identifier  "mon0"'
    296   echo '    HorizSync   28 - 96' >> ${xfconfig}   add_x11conf '    HorizSync   28 - 96'
    297   echo '    VertRefresh 50-60' >> ${xfconfig}   add_x11conf '    VertRefresh 50-60'
    298   echo '    Option      "DPMS"' >> ${xfconfig}   add_x11conf '    Option      "DPMS"'
    299   echo 'EndSection' >> ${xfconfig}   add_x11conf 'EndSection'
    300   fi   fi
    301    
    302   #vga   # vga
    303   #to be safe   # to be safe
    304   local XSERVER XMODULE XDESC   local XSERVER XMODULE XDESC
    305    
    306   #get config   # get config
    307   [ -f /etc/sysconfig/hwsetup/xserver ] && source /etc/sysconfig/hwsetup/xserver   [ -f /etc/sysconfig/hwsetup/xserver ] && source /etc/sysconfig/hwsetup/xserver
    308    
    309   echo '' >> ${xfconfig}   add_x11conf ''
    310   echo 'Section "Device"' >> ${xfconfig}   add_x11conf 'Section "Device"'
    311   echo '    Identifier  "vga0"' >> ${xfconfig}   add_x11conf '    Identifier  "vga0"'
    312    
    313   if [ -n "${XMODULE}" ]   if [[ -n ${XMODULE} ]]
    314   then   then
    315   # vmware module has some probs with fb consoles   # vmware module has some probs with fb consoles
    316   # very dirty glyphes appear, so we use vesa instead   # very dirty glyphes appear, so we use vesa instead
    317   [ "${XMODULE}" = "vmware" ] && XMODULE="vesa"   [[ ${XMODULE} = vmware ]] && XMODULE="vesa"
    318    
    319     # i810 needs the intel-agp kernel module to run probably
    320     [[ ${XMODULE} = i810 ]] && \
    321     [ -f /lib/modules/$(uname -r)/kernel/drivers/char/agp/intel-agp.ko ] && \
    322     add_modconf 'intel-agp'
    323    
    324   echo -e ${COLOREDSTAR}"Video: ${XDESC}"   echo -e ${COLOREDSTAR}"Video: ${XDESC}"
    325   echo -e ${COLOREDSTAR}"Video module: ${XMODULE}"   echo -e ${COLOREDSTAR}"Video module: ${XMODULE}"
    326   echo "    Driver      \"${XMODULE}\"" >> ${xfconfig}   add_x11conf "    Driver      \"${XMODULE}\""
    327   else   else
    328   echo -e ${COLOREDSTAR}"Video unknown, trying to use the standard 'vesa' module ..."   echo -e ${COLOREDSTAR}"Video unknown, trying to use the standard 'vesa' module ..."
    329   echo '    Driver      "vesa"' >> ${xfconfig}   add_x11conf '    Driver      "vesa"'
    330   fi   fi
    331    
    332   #vnc server options   if [[ ${USE_AIGLX} = yes ]]
      if [ "${HAS_VNC}" = "yes" ]  
    333   then   then
    334   echo '' >> ${xfconfig}   add_x11conf ''
    335   echo '    # rfb options' >> ${xfconfig}   [[ ${XMODULE} = radeon ]] && add_x11conf '    Option  "XAANoOffscreenPixmaps" "true"'
    336   echo '    Option "rfbauth"     "/root/.vnc/passwd"' >> ${xfconfig}           add_x11conf '    Option  "DRI"   "true"'
    337   echo '    Option "rfbport"     "5900"' >> ${xfconfig}   add_x11conf ''
    338   echo '    #Option "nevershared"' >> ${xfconfig}   fi
    339   echo '    Option "alwaysshared"' >> ${xfconfig}  
    340   echo '    Option "dontdisconnect"' >> ${xfconfig}   # vnc server options
    341   echo '    Option "httpdir"     "/usr/share/vnc/classes"' >> ${xfconfig}   if [[ ${HAS_VNC} = yes ]]
    342   echo '    Option "httpport"    "5800"' >> ${xfconfig}   then
    343   echo '    # Option "useraccept"' >> ${xfconfig}   add_x11conf ''
    344   echo '    Option "usevnc"' >> ${xfconfig}   add_x11conf '    # rfb options'
    345   echo '    # Option "localhost"' >> ${xfconfig}   add_x11conf '    Option "rfbauth"     "/root/.vnc/passwd"'
    346   echo '    # Option "interface" "192.168.0.1"' >> ${xfconfig}   add_x11conf '    Option "rfbport"     "5900"'
    347   echo '    # Option "viewonly"' >> ${xfconfig}   add_x11conf '    # Option "nevershared"'
    348   echo '    # Option "loginauth"' >> ${xfconfig}   add_x11conf '    Option "alwaysshared"'
    349   echo '' >> ${xfconfig}   add_x11conf '    Option "dontdisconnect"'
    350     add_x11conf '    Option "httpdir"     "/usr/share/vnc/classes"'
    351     add_x11conf '    Option "httpport"    "5800"'
    352     add_x11conf '    # Option "useraccept"'
    353     add_x11conf '    Option "usevnc"'
    354     add_x11conf '    # Option "localhost"'
    355     add_x11conf '    # Option "interface" "192.168.0.1"'
    356     add_x11conf '    # Option "viewonly"'
    357     add_x11conf '    # Option "loginauth"'
    358     add_x11conf ''
    359   fi   fi
    360    
    361   echo 'EndSection' >> ${xfconfig}   add_x11conf 'EndSection'
    362   #to be safe   # to be safe
    363   unset XSERVER XMODULE XDESC   unset XSERVER XMODULE XDESC
       
       
      #screens  
      echo '' >> ${xfconfig}  
      echo 'Section "Screen"' >> ${xfconfig}  
      echo '    Identifier  "Screen 1"' >> ${xfconfig}  
      echo '    Device      "vga0"' >> ${xfconfig}  
      #echo '    Monitor     "mon0"' >> ${xfconfig}  
      echo '    Monitor     "Monitor0"' >> ${xfconfig}  
      echo '    DefaultDepth 16' >> ${xfconfig}  
      echo '    Subsection "Display"' >> ${xfconfig}  
      echo '        Depth       8' >> ${xfconfig}  
      echo '        Modes       "1024x768"' >> ${xfconfig}  
      echo '        ViewPort    0 0' >> ${xfconfig}  
      echo '    EndSubsection' >> ${xfconfig}  
      echo '    Subsection "Display"' >> ${xfconfig}  
      echo '        Depth       16' >> ${xfconfig}  
      echo '        Modes       "1024x768"' >> ${xfconfig}  
      echo '        ViewPort    0 0' >> ${xfconfig}  
      echo '    EndSubsection' >> ${xfconfig}  
      echo '    Subsection "Display"' >> ${xfconfig}  
      echo '        Depth       24' >> ${xfconfig}  
      echo '        Modes       "1024x768"' >> ${xfconfig}  
      echo '        ViewPort    0 0' >> ${xfconfig}  
      echo '    EndSubsection' >> ${xfconfig}  
      echo 'EndSection' >> ${xfconfig}  
       
       
      #server layout  
      echo '' >> ${xfconfig}  
      echo 'Section "ServerLayout"' >> ${xfconfig}  
      echo '    Identifier  "Simple Layout"' >> ${xfconfig}  
      echo '    Screen "Screen 1"' >> ${xfconfig}  
      echo '    InputDevice "Mouse1" "CorePointer"' >> ${xfconfig}  
      echo '    InputDevice "Keyboard1" "CoreKeyboard"' >> ${xfconfig}  
    364    
    365   #load vnc keyboard && mouse  
    366   if [ "${HAS_VNC}" = "yes" ]   # screens
    367     add_x11conf ''
    368     add_x11conf 'Section "Screen"'
    369     add_x11conf '    Identifier  "Screen 1"'
    370     add_x11conf '    Device      "vga0"'
    371     add_x11conf '    Monitor     "Monitor0"'
    372     add_x11conf '    DefaultDepth 16'
    373     add_x11conf '    Subsection "Display"'
    374     add_x11conf '        Depth       8'
    375     add_x11conf '        Modes       "1024x768"'
    376     add_x11conf '        ViewPort    0 0'
    377     add_x11conf '    EndSubsection'
    378     add_x11conf '    Subsection "Display"'
    379     add_x11conf '        Depth       16'
    380     add_x11conf '        Modes       "1024x768"'
    381     add_x11conf '        ViewPort    0 0'
    382     add_x11conf '    EndSubsection'
    383     add_x11conf '    Subsection "Display"'
    384     add_x11conf '        Depth       24'
    385     add_x11conf '        Modes       "1024x768"'
    386     add_x11conf '        ViewPort    0 0'
    387     add_x11conf '    EndSubsection'
    388     add_x11conf 'EndSection'
    389    
    390    
    391     # server layout
    392     add_x11conf ''
    393     add_x11conf 'Section "ServerLayout"'
    394     add_x11conf '    Identifier  "Simple Layout"'
    395     add_x11conf '    Screen "Screen 1"'
    396     add_x11conf '    InputDevice "Mouse1" "CorePointer"'
    397     add_x11conf '    InputDevice "Keyboard1" "CoreKeyboard"'
    398    
    399     # load vnc keyboard && mouse
    400     if [[ ${HAS_VNC} = yes ]]
    401   then   then
    402   echo '    InputDevice "vncMouse"    "ExtraPointer"' >> ${xfconfig}   add_x11conf '    InputDevice "vncMouse"    "ExtraPointer"'
    403   echo '    InputDevice "vncKeyboard" "ExtraKeyboard"' >> ${xfconfig}   add_x11conf '    InputDevice "vncKeyboard" "ExtraKeyboard"'
    404   fi   fi
    405    
    406   echo 'EndSection' >> ${xfconfig}   if [[ ${USE_AIGLX} = yes ]]
    407     then
    408     add_x11conf ''
    409     add_x11conf '    Option      "AIGLX" "true"'
    410     add_x11conf ''
    411     fi
    412    
    413   #dri (here disabled, use default of xserver)  
    414   echo '' >> ${xfconfig}   add_x11conf 'EndSection'
    415   echo '# Section "DRI"' >> ${xfconfig}  
    416   echo '#    Mode 0666' >> ${xfconfig}  
    417   echo '# EndSection' >> ${xfconfig}   # dri (here disabled, use default of xserver)
    418     add_x11conf ''
    419     if [[ ${USE_AIGLX} = yes ]]
    420     then
    421     add_x11conf 'Section "DRI"'
    422     add_x11conf '     Group 0'
    423     add_x11conf '     Mode 0666'
    424     add_x11conf 'EndSection'
    425     else
    426     add_x11conf '# Section "DRI"'
    427     add_x11conf '#      Group 0'
    428     add_x11conf '#      Mode 0666'
    429     add_x11conf '# EndSection'
    430     fi
    431  }  }
    432    
    433    
    434  run_hwdetection() {  run_hwdetection()
    435    {
    436   echo -e ${COLOREDSTAR}"Hardware Autodetection started ..."   echo -e ${COLOREDSTAR}"Hardware Autodetection started ..."
    437   echo -e ${COLOREDSTAR}"Prozessor: $(cat /proc/cpuinfo |grep "model name" | sed -e 's:model\ name*.*\: ::')"   echo -e ${COLOREDSTAR}"Prozessor: $(cat /proc/cpuinfo |grep "model name" | sed -e 's:model\ name*.*\: ::')"
    438    
    439    
    440   #cleaning up old data-crap   # cleaning up old data-crap
    441   if [ -e /etc/sysconfig/hwsetup ]   if [ -e /etc/sysconfig/hwsetup ]
    442   then   then
    443   echo -e ${COLOREDSTAR}"Cleaning up old data ..."   echo -e ${COLOREDSTAR}"Cleaning up old data ..."
    # Line 379  run_hwdetection() { Line 446  run_hwdetection() {
    446    
    447   echo -en "${COLOREDSTAR}";hwsetup -p > /dev/null   echo -en "${COLOREDSTAR}";hwsetup -p > /dev/null
    448    
    449   #clean up modules   # clean up modules
    450   if [ -f /etc/modules.autoload.d/kernel-$(kernel_major_version) ]   if [ -f /etc/modules.autoload.d/kernel-$(kernel_major_version) ]
    451   then   then
    452   echo -e ${COLOREDSTAR}"Cleaning up /etc/modules.autoload.d/kernel-$(kernel_major_version) ..."   echo -e ${COLOREDSTAR}"Cleaning up /etc/modules.autoload.d/kernel-$(kernel_major_version) ..."
    453   echo > /etc/modules.autoload.d/kernel-$(kernel_major_version)   echo > /etc/modules.autoload.d/kernel-$(kernel_major_version)
    454   evaluate_retval   evaluate_retval
    455   fi   fi
    456     if [ -f /etc/modules.autoload ]
    457     then
    458     echo -e ${COLOREDSTAR}"Cleaning up /etc/modules.autoload ..."
    459     echo > /etc/modules.autoload
    460     evaluate_retval
    461     fi
    462    
    463   #load module for parallel printing if exists   # load module for parallel printing if exists
    464   if [ -e /lib/modules/`uname -r`/kernel/drivers/char/lp.o ]   if [ -e /lib/modules/$(uname -r)/kernel/drivers/char/lp.o ]
    465   then   then
    466   echo "lp" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)   add_modconf 'lp'
    467   fi   fi
    468    
    469   #get what hwsetup has found   # get what hwsetup has found
    470   if [ -f /etc/sysconfig/hwsetup/knoppix ]   if [ -f /etc/sysconfig/hwsetup/knoppix ]
    471   then   then
    472   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
    473   fi   fi
    474    
    475   #network setup (dhcp)   # network setup (dhcp)
    476   #for i in $(cat /proc/net/dev|grep eth.|cut -d ':' -f1)   if [[ -n ${NETCARD_DRIVER}  ]]
      #do  
      # echo -e ${COLOREDSTAR}"Network ${i}: ${NETCARD_FULLNAME}"  
      if [ -n "${NETCARD_DRIVER}" ]  
    477   then   then
    478   echo -e ${COLOREDSTAR}"Network eth0: ${NETCARD_FULLNAME}"   echo -e ${COLOREDSTAR}"Network eth0: ${NETCARD_FULLNAME}"
    479   echo -e ${COLOREDSTAR}"Network module: ${NETCARD_DRIVER}"   echo -e ${COLOREDSTAR}"Network module: ${NETCARD_DRIVER}"
    480   echo "${NETCARD_DRIVER}" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)   add_modconf "${NETCARD_DRIVER}"
    481   evaluate_retval   evaluate_retval
    482   fi   fi
      #done  
    483    
    484   #sound setup   # sound setup
    485   if [ -n "${SOUND_DRIVER}" ]   if [[ -n ${SOUND_DRIVER} ]]
    486   then   then
    487   echo -e ${COLOREDSTAR}"Sound (${SOUND_FULLNAME}) found"   echo -e ${COLOREDSTAR}"Sound (${SOUND_FULLNAME}) found"
    488   echo -e ${COLOREDSTAR}"Sound module: ${SOUND_DRIVER}"   echo -e ${COLOREDSTAR}"Sound module: ${SOUND_DRIVER}"
    489   echo "${SOUND_DRIVER}" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)   add_modconf "${SOUND_DRIVER}"
    490   evaluate_retval   evaluate_retval
    491   fi   fi
    492    
    493   #write default xfree-config   # write default xfree-config
    494   echo -e ${COLOREDSTAR}"Generating x11 configuration ..."   echo -e ${COLOREDSTAR}"Generating x11 configuration ..."
    495   write_x11_config   write_x11_config
    496   evaluate_retval   evaluate_retval
    # Line 434  source $rc_functions Line 503  source $rc_functions
    503    
    504  case $1 in  case $1 in
    505   start)   start)
    506   #we wouldn't start hwdetection if settings where imported (alx-only)   # we wouldn't start hwdetection if settings where imported (alx-only)
    507   if [ ! -e /etc/alx-config/imported ]   if [ ! -e /etc/alx-config/imported ]
    508   then   then
    509   run_hwdetection   run_hwdetection
    # Line 443  case $1 in Line 512  case $1 in
    512   update_svcstatus $1   update_svcstatus $1
    513   splash svc_started "$(basename $0)" 0   splash svc_started "$(basename $0)" 0
    514   ;;   ;;
    515        
    516   restart)   restart)
    517   $0 start   $0 start
    518   ;;   ;;
    519      
    520   *)   *)
    521   echo "Usage: $0 {start|restart}"   echo "Usage: $0 {start|restart}"
    522   exit 1   exit 1
    Legend:
    Removed from v.11  
    changed lines
      Added in v.707