Magellan Linux

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

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

revision 2013 by niro, Mon May 9 15:48:19 2011 UTC revision 2014 by niro, Mon May 9 16:01:06 2011 UTC
# Line 667  import_settings_local() Line 667  import_settings_local()
667  preliminary_network()  preliminary_network()
668  {  {
669   local module   local module
  local modulesconf  
670    
671   if [ -f /etc/alxconfig-ng/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
672   then   then
# Line 679  preliminary_network() Line 678  preliminary_network()
678   modprobe ${module}   modprobe ${module}
679   fi   fi
680    
  # check modprobe.conf  
  if [[ $(kernel_major_version) = 2.4 ]]  
  then  
  modulesconf="/etc/modules.conf"  
  else  
  modulesconf="/etc/modprobe.conf"  
  fi  
  if [[ -z $(grep eth0 ${modulesconf}) ]]  
  then  
  modules-update force  
  fi  
681   else   else
682   # vars used by hwsetup   # vars used by hwsetup
683   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
# Line 737  preliminary_network() Line 725  preliminary_network()
725   echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}   echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}
726   ifconfig eth0 down   ifconfig eth0 down
727   fi   fi
728   if ps -A|grep dhcpcd > /dev/null   if ps -A|grep udhcpc > /dev/null
729   then   then
730   dhcpcd -z  &> /dev/null   killall udhcpc  &> /dev/null
731   sleep 1   sleep 1
732   fi   fi
733   evaluate_retval   evaluate_retval

Legend:
Removed from v.2013  
changed lines
  Added in v.2014