Magellan Linux

Diff of /alx-src/branches/alxconf-060/init.d/alxsettings

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

alx-src/branches/alxconf_20060908/init.d/alxsettings revision 1799 by niro, Tue Jan 25 10:44:10 2011 UTC alx-src/branches/alxconf-060/init.d/alxsettings revision 1800 by niro, Thu Apr 14 19:29:35 2011 UTC
# Line 672  import_settings_local() Line 672  import_settings_local()
672  preliminary_network()  preliminary_network()
673  {  {
674   local module   local module
675     local modulesconf
676    
677   if [ -f /etc/alxconfig-ng/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
678   then   then
# Line 682  preliminary_network() Line 683  preliminary_network()
683   module=$(cat ${SETTINGSPATH}/modules)   module=$(cat ${SETTINGSPATH}/modules)
684   modprobe ${module}   modprobe ${module}
685   fi   fi
686    
687     # check modprobe.conf
688     if [[ $(kernel_major_version) = 2.4 ]]
689     then
690     modulesconf="/etc/modules.conf"
691     else
692     modulesconf="/etc/modprobe.conf"
693     fi
694     if [[ -z $(grep eth0 ${modulesconf}) ]]
695     then
696     /sbin/modules-update force
697     fi
698   else   else
699   # vars used by hwdetect   # vars used by hwdetect
700   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME

Legend:
Removed from v.1799  
changed lines
  Added in v.1800