--- mcore-src/trunk/mcore-tools/daemon/client/include/network.client.class 2012/08/13 11:47:16 2031 +++ mcore-src/trunk/mcore-tools/daemon/client/include/network.client.class 2012/08/13 11:59:21 2032 @@ -83,6 +83,7 @@ local broadcast="$5" local network="$6" local CONFIG + local dhcp_prog [[ -z ${iface} ]] && help_network_iface && return 1 [[ -z ${networking} ]] && help_network_iface && return 1 @@ -113,11 +114,25 @@ ;; esac - if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]] + if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]] then - set_system_service restart network "${iface}" + if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]] + then + set_system_service restart network "${iface}" + else + set_system_service start network "${iface}" + fi else - set_system_service start network "${iface}" + case ${networking} in + static) + ifconfig "${iface}" "${ip}" netmask "${netmask}" broadcast "${broadcast}" + ;; + dhcp) + source /etc/conf.d/network + [[ ! -z $(pidof ${dhcp_prog}) ]] && killall ${DEFAULT_DHCP_PROG} + ${DEFAULT_DHCP_PROG} ${DEFAULT_DHCP_START} "${iface}" + ;; + esac fi }