Magellan Linux

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

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

revision 2155 by niro, Tue May 17 21:34:21 2011 UTC revision 2156 by niro, Tue May 17 21:41:48 2011 UTC
# Line 686  preliminary_network() Line 686  preliminary_network()
686   # keeping like always safe:   # keeping like always safe:
687   # no network should be startet here,   # no network should be startet here,
688   # so we can delete all pid files if one exists   # so we can delete all pid files if one exists
689   if [[ ! -z $(pidof udhcpc) ]]   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
690   then   then
691   rc_mecho "Forcing network down"   rc_mecho "Forcing network down"
692   killall udhcpc &> /dev/null   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
693   sleep 1   sleep 1
694   fi   fi
695   [[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop   [[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop
# Line 702  preliminary_network() Line 702  preliminary_network()
702   ${rc_base}/init.d/network start   ${rc_base}/init.d/network start
703   else   else
704   rc_print "Starting default dhcp based networking ... "   rc_print "Starting default dhcp based networking ... "
705   # -t 10 timeout of 10 secs   ${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null
  udhcpc -t 10 &> /dev/null  
706   evaluate_retval   evaluate_retval
707   fi   fi
708   ;;   ;;
# Line 715  preliminary_network() Line 714  preliminary_network()
714   ${rc_base}/init.d/network stop   ${rc_base}/init.d/network stop
715   else   else
716   rc_print "Stopping default dhcp based networking ... "   rc_print "Stopping default dhcp based networking ... "
717   ifconfig eth0 down   ifconfig ${ALX_IFACE} down
718   fi   fi
719   if [[ ! -z $(pidof udhcpc) ]]   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
720   then   then
721   killall udhcpc  &> /dev/null   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
722   sleep 1   sleep 1
723   fi   fi
724   evaluate_retval   evaluate_retval

Legend:
Removed from v.2155  
changed lines
  Added in v.2156