Magellan Linux

Diff of /trunk/installer/include/prepare_networking.sh

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

revision 1476 by niro, Sun May 30 17:39:49 2010 UTC revision 1477 by niro, Wed Aug 3 14:07:36 2011 UTC
# Line 27  case ${NETWORK_METHOD} in Line 27  case ${NETWORK_METHOD} in
27   dhcp)   dhcp)
28   add_network_config ${NETWORK_NIC} 'ONBOOT="yes"'   add_network_config ${NETWORK_NIC} 'ONBOOT="yes"'
29   add_network_config ${NETWORK_NIC} 'NETWORKING="dhcp"'   add_network_config ${NETWORK_NIC} 'NETWORKING="dhcp"'
30   add_network_config ${NETWORK_NIC} 'DHCP_PROG="/sbin/dhcpcd"'   # add this only if no default networking was found which is provided by newer initscripts
31   add_network_config ${NETWORK_NIC} 'DHCP_START="-t 10"'   if [[ ! -f ${INSTALL_ROOT}/conf.d/network ]]
32   add_network_config ${NETWORK_NIC} 'DHCP_STOP="-k"'   then
33     add_network_config ${NETWORK_NIC} 'DHCP_PROG="/sbin/dhcpcd"'
34     add_network_config ${NETWORK_NIC} 'DHCP_START="-t 10"'
35     add_network_config ${NETWORK_NIC} 'DHCP_STOP="-k"'
36     fi
37   ;;   ;;
38   none)   none)
39   add_network_config ${NETWORK_NIC} 'ONBOOT="no"'   add_network_config ${NETWORK_NIC} 'ONBOOT="no"'
# Line 37  case ${NETWORK_METHOD} in Line 41  case ${NETWORK_METHOD} in
41  esac  esac
42    
43  echo "${NETWORK_HOSTNAME}" > ${INSTALL_ROOT}/etc/hostname  echo "${NETWORK_HOSTNAME}" > ${INSTALL_ROOT}/etc/hostname
44    # setup head file with the right domainname for resolv.conf
45    echo "domain ${NETWORK_DOMAIN}" > ${INSTALL_ROOT}/etc/resolv.conf.head
46    
47  if [[ ${NETWORK_METHOD} = static ]]  if [[ ${NETWORK_METHOD} = static ]]
48  then  then
49   # the 'a' in the sed line appends a line after the regex (127.0.0.1.*localhost)   # the 'a' in the sed line appends a line after the regex (127.0.0.1.*localhost) (really needed?)
50   sed -i "/127.0.0.1.*localhost/ a \${NETWORK_IP}\t${NETWORK_HOSTNAME}.${NETWORK_DOMAIN}\t${NETWORK_HOSTNAME}" ${INSTALL_ROOT}/etc/hosts   sed -i "/127.0.0.1.*localhost/ a \${NETWORK_IP}\t${NETWORK_HOSTNAME}.${NETWORK_DOMAIN}\t${NETWORK_HOSTNAME}" ${INSTALL_ROOT}/etc/hosts
51  else  else
52   sed -i "s:^\(127.0.0.1.*localhost\):\1\t${NETWORK_HOSTNAME}.${NETWORK_DOMAIN}\t${NETWORK_HOSTNAME}:" ${INSTALL_ROOT}/etc/hosts   # the 'a' in the sed line appends a line after the regex (127.0.0.1.*localhost) (really needed?)
53     sed -i "/127.0.0.1.*localhost/ a \127.0.0.1\t${NETWORK_HOSTNAME}.${NETWORK_DOMAIN}\t${NETWORK_HOSTNAME}" ${INSTALL_ROOT}/etc/hosts
54  fi  fi

Legend:
Removed from v.1476  
changed lines
  Added in v.1477