diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 21:03:12 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 21:03:12 -0300 |
commit | 4f2c12cb85411e4702e3a6b29f847b08447ef0f0 (patch) | |
tree | 703eb04e60160c82fb3d3a2fc4af64dd8d67222d /src/core/libs/lib-network.sh | |
parent | 74eb858cd962a3178724b83cefa8f43baaffa1ef (diff) | |
parent | 13c8c0813328eb8f52b03b3c53a32f1f40558021 (diff) |
Merge branch 'master' of https://projects.archlinux.org/git/aif
Conflicts:
doc/official_installation_guide_en
Diffstat (limited to 'src/core/libs/lib-network.sh')
-rw-r--r-- | src/core/libs/lib-network.sh | 54 |
1 files changed, 23 insertions, 31 deletions
diff --git a/src/core/libs/lib-network.sh b/src/core/libs/lib-network.sh index 03d5361..3e7914b 100644 --- a/src/core/libs/lib-network.sh +++ b/src/core/libs/lib-network.sh @@ -8,52 +8,44 @@ target_configure_network() { # networking setup could have happened in a separate process (eg partial-configure-network), # so check if the settings file was created to be sure - if [ -f $RUNTIME_DIR/aif-network-settings ]; then + if [[ -f "$RUNTIME_DIR/aif-network-settings" ]]; then debug NETWORK "Configuring network settings on target system according to installer settings" - source $RUNTIME_DIR/aif-network-settings 2>/dev/null || return 1 + source "$RUNTIME_DIR/aif-network-settings" 2>/dev/null || return 1 - IFO=${INTERFACE_PREV:-eth0} # old iface: a previously entered one, or the arch default IFN=${INTERFACE:-eth0} # new iface: a specified one, or the arch default - # comment out any existing uncommented entries, whether specified by us, or arch defaults. - for var in eth0 $IFO INTERFACES gateway ROUTES - do - sed -i "s/^$var=/#$var=/" ${var_TARGET_DIR}/etc/rc.conf || return 1 - done - sed -i "s/^nameserver/#nameserver/" ${var_TARGET_DIR}/etc/resolv.conf || return 1 - if [ -f ${var_TARGET_DIR}/etc/profile.d/proxy.sh ] - then - sed -i "s/^export/#export/" ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 + sed -i "s/^nameserver/#nameserver/" "${var_TARGET_DIR}/etc/resolv.conf" || return 1 + if [[ -f "${var_TARGET_DIR}/etc/profile.d/proxy.sh" ]]; then + sed -i "s/^export/#export/" "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 fi - if [ "$DHCP" = 0 ] ; then - local line="$IFN=\"$IFN ${IPADDR:-192.168.0.2} netmask ${SUBNET:-255.255.255.0} broadcast ${BROADCAST:-192.168.0.255}\"" - append_after_last "/$IFO\|eth0/" "$line" ${var_TARGET_DIR}/etc/rc.conf || return 1 + sed -i "s/^\(interface\)=/\1=$IFN/" "${var_TARGET_DIR}/etc/rc.conf" || return 1 + if (( ! DHCP )); then + sed -i "s/^\(address\)=/\1=$IPADDR/;s/^\(netmask\)=/\1=$SUBNET/" "${var_TARGET_DIR}/etc/rc.conf" - if [ -n "$GW" ]; then - append_after_last "/gateway/" "gateway=\"default gw $GW\"" ${var_TARGET_DIR}/etc/rc.conf || return 1 - append_after_last "/ROUTES/" "ROUTES=(gateway)" ${var_TARGET_DIR}/etc/rc.conf || return 1 + if [[ $BROADCAST ]]; then + sed -i "s/^\(broadcast\)=/\1=$BROADCAST/" "${var_TARGET_DIR}/etc/rc.conf" || return 1 fi - if [ -n "$DNS" ] - then - echo "nameserver $DNS" >> ${var_TARGET_DIR}/etc/resolv.conf || return 1 + + if [[ $GW ]]; then + sed -i "s/^\(gateway\)=/\1=$GW/" "${var_TARGET_DIR}/etc/rc.conf" || return 1 fi - else - append_after_last "/$IFO\|eth0/" "$IFN=\"dhcp\"" ${var_TARGET_DIR}/etc/rc.conf || return 1 - fi - append_after_last "/$IFO\|eth0/" "INTERFACES=($IFN)" ${var_TARGET_DIR}/etc/rc.conf || return 1 + if [[ $DNS ]]; then + echo "nameserver $DNS" >> "${var_TARGET_DIR}/etc/resolv.conf" || return 2 + fi + fi - if [ -n "$PROXY_HTTP" ]; then - echo "export http_proxy=$PROXY_HTTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 - chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 + if [[ $PROXY_HTTP ]]; then + echo "export http_proxy=$PROXY_HTTP" >> "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 + chmod a+x "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 fi - if [ -n "$PROXY_FTP" ]; then - echo "export ftp_proxy=$PROXY_FTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 - chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 + if [[ $PROXY_FTP ]]; then + echo "export ftp_proxy=$PROXY_FTP" >> "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 + chmod a+x "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 fi else debug NETWORK "Skipping Host Network Configuration - aif-network-settings not found" |