Magellan Linux

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

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

revision 387 by niro, Wed Jun 4 16:52:25 2008 UTC revision 397 by niro, Wed Jun 4 18:30:03 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.2 2008-06-04 16:52:25 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.6 2008-06-04 18:30:03 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 647  preliminary_network() Line 653  preliminary_network()
653   case $1 in   case $1 in
654   start)   start)
655   # keeping like always safe:   # keeping like always safe:
656   # no network should be startet here,   # no network should be started here
657   # 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  
658    
659   echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}
   
660   # start network configured from /etc/conf.d   # start network configured from /etc/conf.d
661   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  
662   ;;   ;;
663    
664   stop)   stop)
665   echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}
666   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  
667   ;;   ;;
668    
669   *)   *)

Legend:
Removed from v.387  
changed lines
  Added in v.397