Magellan Linux

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

    Diff of /mcore-src/trunk/mcore-tools/src/modules/network/network.client.class.in

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

    mcore-src/trunk/mcore-tools/daemon/client/include/network.client.class revision 1896 by niro, Fri Nov 4 08:24:27 2011 UTC mcore-src/trunk/mcore-tools/src/modules/network/network.client.class.in revision 2187 by niro, Fri Jan 10 14:27:10 2014 UTC
    # Line 6  require basic-system Line 6  require basic-system
    6  help_network_hostname()  help_network_hostname()
    7  {  {
    8   mecho "get network.hostname"   mecho "get network.hostname"
    9   mecho " displays the current hostname"   mecho " Displays the current hostname"
    10   mecho   mecho
    11   mecho "set network.hostname [hostname]"   mecho "set network.hostname [hostname]"
    12   mecho " Sets the hostname of the system"   mecho " Sets the hostname of the system"
    # Line 15  help_network_hostname() Line 15  help_network_hostname()
    15    
    16  get_network_hostname()  get_network_hostname()
    17  {  {
    18   hostname   local val
    19    
    20     if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    21     then
    22     val=$(hostname)
    23     else
    24     val=$(< @@SYSCONFDIR@@/hostname)
    25     fi
    26    
    27     rvecho "${val}"
    28  }  }
    29    
    30  # set_network_hostname $value  # set_network_hostname $value
    # Line 29  set_network_hostname() Line 38  set_network_hostname()
    38    
    39   [[ -z ${value} ]] && help_network_hostname && return 1   [[ -z ${value} ]] && help_network_hostname && return 1
    40    
    41   CONFIG="/etc/hostname"   CONFIG="@@SYSCONFDIR@@/hostname"
    42   clearconfig   clearconfig
    43   addconfig "${value}"   addconfig "${value}"
    44   hostname "${value}"   hostname "${value}"
    45    
    46   # update hosts file   # update hosts file
    47   CONFIG="/etc/hosts"   CONFIG="@@SYSCONFDIR@@/hosts"
    48   clearconfig   clearconfig
    49   addconfig "127.0.0.1 localhost ${value}"   addconfig "127.0.0.1 localhost ${value}"
    50   # add ipv6 defaults   # add ipv6 defaults
    # Line 59  set_network_hostname() Line 68  set_network_hostname()
    68    
    69  help_network_iface()  help_network_iface()
    70  {  {
    71     mecho "get network.iface"
    72     mecho " Lists all configured network interfaces"
    73     mecho
    74   mecho "set network.iface [iface] [networking] [ip] [netmask] [broadcast] [network]"   mecho "set network.iface [iface] [networking] [ip] [netmask] [broadcast] [network]"
    75     mecho " Configure network interfaces"
    76   mecho "  iface - the interface name"   mecho "  iface - the interface name"
    77   mecho "  networking - may be 'static' or 'dhcp'"   mecho "  networking - may be 'static' or 'dhcp'"
    78   mecho "  ip, netmask, broadcast and network are optional and only required on static networking"   mecho "  ip, netmask, broadcast and network are optional and only required on static networking"
    79  }  }
    80    
    81    get_network_iface()
    82    {
    83     local iface
    84     for iface in $(find ${MROOT}@@CONFDDIR@@ -maxdepth 1 -name 'net.*' -printf '%f\n')
    85     do
    86     case ${iface} in
    87     # exclude routes and samples
    88     net.sample|net.routes) continue ;;
    89     esac
    90     rvecho -n "${iface//net.}"
    91     ( cat ${MROOT}@@CONFDDIR@@${iface}; echo ) | while read line
    92     do
    93     rvecho -n ";${line}"
    94     done
    95     rvecho
    96     done
    97    }
    98    
    99  set_network_iface()  set_network_iface()
    100  {  {
    101   local iface="$1"   local iface="$1"
    # Line 74  set_network_iface() Line 105  set_network_iface()
    105   local broadcast="$5"   local broadcast="$5"
    106   local network="$6"   local network="$6"
    107   local CONFIG   local CONFIG
    108     local dhcp_prog
    109    
    110   [[ -z ${iface} ]] && help_network_iface && return 1   [[ -z ${iface} ]] && help_network_iface && return 1
    111   [[ -z ${networking} ]] && help_network_iface && return 1   [[ -z ${networking} ]] && help_network_iface && return 1
    # Line 86  set_network_iface() Line 118  set_network_iface()
    118   [[ -z ${network} ]] && help_network_iface && return 1   [[ -z ${network} ]] && help_network_iface && return 1
    119   fi   fi
    120    
    121   CONFIG="/etc/conf.d/net.${iface}"   CONFIG="@@CONFDDIR@@/net.${iface}"
    122   clearconfig   clearconfig
    123   addconfig 'ONBOOT="yes"'   addconfig 'ONBOOT="yes"'
    124    
    # Line 104  set_network_iface() Line 136  set_network_iface()
    136   ;;   ;;
    137   esac   esac
    138    
    139   if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    140   then   then
    141   set_system_service restart network "${iface}"   if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]]
    142     then
    143     set_system_service restart network "${iface}"
    144     else
    145     set_system_service start network "${iface}"
    146     fi
    147   else   else
    148   set_system_service start network "${iface}"   case ${networking} in
    149     static)
    150     ifconfig "${iface}" "${ip}" netmask "${netmask}" broadcast "${broadcast}"
    151     ;;
    152     dhcp)
    153     source @@CONFDDIR@@/network
    154     [[ ! -z $(pidof ${dhcp_prog}) ]] && killall ${DEFAULT_DHCP_PROG}
    155     ${DEFAULT_DHCP_PROG} ${DEFAULT_DHCP_START} "${iface}"
    156     ;;
    157     esac
    158   fi   fi
    159  }  }
    160    
    # Line 136  set_network_gateway() Line 182  set_network_gateway()
    182    
    183   [[ -z ${value} ]] && help_network_gateway && return 1   [[ -z ${value} ]] && help_network_gateway && return 1
    184    
    185   CONFIG="/etc/conf.d/net.routes"   CONFIG="@@CONFDDIR@@/net.routes"
    186   clearconfig   clearconfig
    187   addconfig "default gw ${value}"   addconfig "default gw ${value}"
    188    
    # Line 162  get_network_nameserver() Line 208  get_network_nameserver()
    208   local dns   local dns
    209   local i   local i
    210    
    211   dns=$(grep nameserver /etc/resolv.conf | sed 's:.*[[:space:]]\(.*\):\1:g')   dns=$(grep nameserver @@SYSCONFDIR@@/resolv.conf | sed 's:.*[[:space:]]\(.*\):\1:g')
    212   for i in ${dns}   for i in ${dns}
    213   do   do
    214   rvecho "${i}"   rvecho "${i}"
    # Line 177  set_network_nameserver() Line 223  set_network_nameserver()
    223    
    224   [[ -z ${values} ]] && help_network_nameserver && return 1   [[ -z ${values} ]] && help_network_nameserver && return 1
    225    
    226   CONFIG="/etc/resolv.conf"   CONFIG="@@SYSCONFDIR@@/resolv.conf"
    227   clearconfig   clearconfig
    228   for i in ${values}   for i in ${values}
    229   do   do
    Legend:
    Removed from v.1896  
    changed lines
      Added in v.2187