Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/daemon/client/include/network.client.class

    Diff of /mcore-src/trunk/mcore-tools/daemon/client/include/network.client.class

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

    revision 2031 by niro, Mon Aug 13 11:28:31 2012 UTC revision 2032 by niro, Mon Aug 13 11:59:21 2012 UTC
    # Line 83  set_network_iface() Line 83  set_network_iface()
    83   local broadcast="$5"   local broadcast="$5"
    84   local network="$6"   local network="$6"
    85   local CONFIG   local CONFIG
    86     local dhcp_prog
    87    
    88   [[ -z ${iface} ]] && help_network_iface && return 1   [[ -z ${iface} ]] && help_network_iface && return 1
    89   [[ -z ${networking} ]] && help_network_iface && return 1   [[ -z ${networking} ]] && help_network_iface && return 1
    # Line 113  set_network_iface() Line 114  set_network_iface()
    114   ;;   ;;
    115   esac   esac
    116    
    117   if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    118   then   then
    119   set_system_service restart network "${iface}"   if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]]
    120     then
    121     set_system_service restart network "${iface}"
    122     else
    123     set_system_service start network "${iface}"
    124     fi
    125   else   else
    126   set_system_service start network "${iface}"   case ${networking} in
    127     static)
    128     ifconfig "${iface}" "${ip}" netmask "${netmask}" broadcast "${broadcast}"
    129     ;;
    130     dhcp)
    131     source /etc/conf.d/network
    132     [[ ! -z $(pidof ${dhcp_prog}) ]] && killall ${DEFAULT_DHCP_PROG}
    133     ${DEFAULT_DHCP_PROG} ${DEFAULT_DHCP_START} "${iface}"
    134     ;;
    135     esac
    136   fi   fi
    137  }  }
    138    
    Legend:
    Removed from v.2031  
    changed lines
      Added in v.2032