Magellan Linux

Diff of /trunk/magellan-initscripts/etc/rc.d/init.d/network

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

revision 954 by niro, Thu Nov 5 12:57:14 2009 UTC revision 955 by niro, Sun Dec 27 02:49:25 2009 UTC
# Line 103  checkconfig() Line 103  checkconfig()
103   dhcp)   dhcp)
104   if [[ -z ${DHCP_PROG} ]]   if [[ -z ${DHCP_PROG} ]]
105   then   then
106   echo "DHCP_PROG missing in net.${interface}, aborted"   echo -n "DHCP_PROG missing in net.${interface},"
107   exit 1   echo "using default programm"
108     DHCP_PROG="/sbin/dhcpcd"
109   fi   fi
110     [[ -z ${DHCP_START} ]] && DHCP_START="-t 10"
111     [[ -z ${DHCP_STOP} ]] && DHCP_STOP="-k"
112   ;;   ;;
113    
114   esac   esac
# Line 382  networking_start() Line 385  networking_start()
385   checkconfig   checkconfig
386    
387   # setup mac   # setup mac
388   if [ -n "${FORCE_MAC_TO}" ]   if [[ -n ${FORCE_MAC_TO} ]]
389   then   then
390   echo -e ${COLOREDSTAR}"Faking MAC to ${FORCE_MAC_TO} for ${COLBLUE}${iface}${COLDEFAULT} ... "   echo -e ${COLOREDSTAR}"Faking MAC to ${FORCE_MAC_TO} for ${COLBLUE}${iface}${COLDEFAULT} ... "
391   ifconfig "${iface}" hw ether "${FORCE_MAC_TO}"   ifconfig "${iface}" hw ether "${FORCE_MAC_TO}"
# Line 409  networking_start() Line 412  networking_start()
412   ${CURS_UP}   ${CURS_UP}
413   ${SET_WWCOL}   ${SET_WWCOL}
414   echo "[DHCP]"   echo "[DHCP]"
415   loadproc ${DHCP_PROG} ${DHCP_START} "${iface}"   loadproc "${DHCP_PROG}" "${DHCP_START}" "${iface}"
416   ;;   ;;
417   static|STATIC)   static|STATIC)
418   ${CURS_UP}   ${CURS_UP}

Legend:
Removed from v.954  
changed lines
  Added in v.955