Magellan Linux

Diff of /alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings

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

revision 386 by niro, Wed Jun 4 16:47:56 2008 UTC revision 418 by niro, Wed Jun 4 21:00:17 2008 UTC
# Line 2  Line 2 
2    
3  # <niro@magellan-linux.de>  # <niro@magellan-linux.de>
4    
5  #%rlevels: 7:s 0:k 6:k  #%rlevels: 7:s 0:k
6  #%start: 41  #%start: 41
7  #%stop: 01  #%stop: 01
8    
# Line 11  Line 11 
11  #%before:  #%before:
12  #%after:  #%after:
13    
14  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.1 2008-06-04 16:47:56 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.7 2008-06-04 21:00:17 niro Exp $
15    
16  # checks first if the client was already configured and if it has an valid serial  # checks first if the client was already configured and if it has an valid serial
17  # if not it runs the autoconfiguration script  # if not it runs the autoconfiguration script
# Line 153  get_system_serial() Line 153  get_system_serial()
153   else   else
154   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
155   fi   fi
156     # cleaning up old data-crap
157     if [ -d /etc/sysconfig/hwsetup ]
158     then
159     echo -e ${COLOREDSTAR}"Cleaning up old data ..."
160     rm -f /etc/sysconfig/hwsetup/*
161     fi
162   ALX_HW_DETECT=true   ALX_HW_DETECT=true
163   /etc/init.d/hwdetect start   echo -en "${COLOREDSTAR}";hwsetup -p > /dev/null
164    
165   # set hostname to alx_default_hostname   # set hostname to alx_default_hostname
166   # use old hostname if this is a forced re-check   # use old hostname if this is a forced re-check
# Line 541  import_settings_local() Line 547  import_settings_local()
547   echo   echo
548   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}
549    
  if [[ ${ALX_CONFD_NETWORKING} = false ]]  
  then  
  #[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}  
  #echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules  
   
  # set an device alias for modprobe.conf  
  [ ! -d /etc/modules.d ] && install -d /etc/modules.d  
  echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0  
   
  # regenerate modprobe.conf  
  [ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"  
  evaluate_retval  
  fi  
   
550   # set system state to 'already configured'   # set system state to 'already configured'
551   touch /etc/alxconfig-ng/state/configured   touch /etc/alxconfig-ng/state/configured
552    
# Line 644  import_settings_local() Line 636  import_settings_local()
636  # start|stop  # start|stop
637  preliminary_network()  preliminary_network()
638  {  {
  local module  
   
  if [ -f /etc/alxconfig-ng/state/configured ]  
  then  
  # compat for old clients  
  if [ -f ${SETTINGSPATH}/modules ]  
  then  
  # get module name  
  module=$(cat ${SETTINGSPATH}/modules)  
  modprobe ${module}  
  fi  
  else  
  # vars used by hwdetect  
  local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME  
  local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER  
   
  # get setting from hwdetect  
  source /etc/sysconfig/hwsetup/knoppix  
  modprobe ${NETCARD_DRIVER}  
  fi  
   
639   case $1 in   case $1 in
640   start)   start)
641   # keeping like always safe:   # keeping like always safe:
642   # no network should be startet here,   # no network should be started here
643   # so we can delete all pid files if one exists   ${rc_base}/init.d/network stop
  if ps -A|grep dhcpcd > /dev/null  
  then  
  echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}  
  dhcpcd -k  
  sleep 1  
  else  
  rm -f /var/run/dhcpcd-eth?.pid  
  fi  
  [[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \  
  ${rc_base}/init.d/network stop  
644    
645   echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}
   
646   # start network configured from /etc/conf.d   # start network configured from /etc/conf.d
647   if [[ ${ALX_CONFD_NETWORKING} = true ]]   ${rc_base}/init.d/network start
  then  
  ${rc_base}/init.d/network start  
  else  
  echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}  
  # -t 10 timeout of 10 secs  
  dhcpcd -t 10 &> /dev/null  
  evaluate_retval  
  fi  
648   ;;   ;;
649    
650   stop)   stop)
651   echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}
652   if [[ ${ALX_CONFD_NETWORKING} = true ]]   ${rc_base}/init.d/network stop
  then  
  ${rc_base}/init.d/network stop  
  else  
  echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}  
  ifconfig eth0 down  
  fi  
  if ps -A|grep dhcpcd > /dev/null  
  then  
  dhcpcd -z  &> /dev/null  
  fi  
  evaluate_retval  
653   ;;   ;;
654    
655   *)   *)

Legend:
Removed from v.386  
changed lines
  Added in v.418