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 706 by niro, Wed Apr 25 13:26:33 2007 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.6 2007-04-25 13:26:33 niro Exp $  # $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 21  add_x11conf() Line 21  add_x11conf()
21  add_modconf()  add_modconf()
22  {  {
23   local var="$1"   local var="$1"
24   echo "${var}" >> /etc/modules.autoload.d/kernel-$(kernel_major_version) || die "add_modconf() adding \$var"   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()  write_x11_config()
# Line 443  run_hwdetection() Line 453  run_hwdetection()
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 ]

Legend:
Removed from v.706  
changed lines
  Added in v.707