Magellan Linux

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

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

revision 220 by niro, Sun Jul 3 21:31:27 2005 UTC revision 221 by niro, Wed Aug 31 21:46:24 2005 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.4 2005-07-03 21:31:27 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/hwdetect,v 1.5 2005-08-31 21:46:24 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 273  write_x11_config() { Line 273  write_x11_config() {
273   then   then
274   # vmware module has some probs with fb consoles   # vmware module has some probs with fb consoles
275   # very dirty glyphes appear, so we use vesa instead   # very dirty glyphes appear, so we use vesa instead
276   [ "${XMODULE}" = "vmware" ] && XMODULE="vesa"   [[ ${XMODULE} = vmware ]] && XMODULE="vesa"
277    
278     # i810 needs the intel-agp kernel module to run probably
279     [[ ${XMODULE} = i810 ]] && \
280     [ -f /lib/modules/$(uname -r)/kernel/drivers/char/agp/intel-agp.ko ] && \
281     echo "intel-agp" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)
282    
283   echo -e ${COLOREDSTAR}"Video: ${XDESC}"   echo -e ${COLOREDSTAR}"Video: ${XDESC}"
284   echo -e ${COLOREDSTAR}"Video module: ${XMODULE}"   echo -e ${COLOREDSTAR}"Video module: ${XMODULE}"
285   echo "    Driver      \"${XMODULE}\"" >> ${xfconfig}   echo "    Driver      \"${XMODULE}\"" >> ${xfconfig}
# Line 385  run_hwdetection() { Line 391  run_hwdetection() {
391   if [ -e /lib/modules/$(uname -r)/kernel/drivers/char/lp.o ]   if [ -e /lib/modules/$(uname -r)/kernel/drivers/char/lp.o ]
392   then   then
393   echo "lp" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)   echo "lp" >> /etc/modules.autoload.d/kernel-$(kernel_major_version)
394   fi   fi
395    
396   # get what hwsetup has found   # get what hwsetup has found
397   if [ -f /etc/sysconfig/hwsetup/knoppix ]   if [ -f /etc/sysconfig/hwsetup/knoppix ]

Legend:
Removed from v.220  
changed lines
  Added in v.221