diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-08-01 20:29:54 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-08-01 20:29:54 +0200 |
| commit | 6026c6971851c860a4cee203b20216fff4b3216f (patch) | |
| tree | 462efc5149dfa84f26e08889668e8268181ca26a /src/core/libs/lib-network.sh | |
| parent | ff9a3ed1b996b4315ce97cc4e49db831d860dfc0 (diff) | |
transparantly handle non-existing vars + use appropriate exit codes
Diffstat (limited to 'src/core/libs/lib-network.sh')
| -rw-r--r-- | src/core/libs/lib-network.sh | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/src/core/libs/lib-network.sh b/src/core/libs/lib-network.sh index 85e597c..b7f6c08 100644 --- a/src/core/libs/lib-network.sh +++ b/src/core/libs/lib-network.sh @@ -1,39 +1,41 @@ #!/bin/bash -# auto_network(). taken from setup. edited -# configures network on host system according to installer -# settings if user wishes to do so +# auto_network(). +# configures network on host system according to installer settings +# if some variables are not set, we handle that transparantly # $1 dhcp/fixed # $2 http proxy (optional. defaults to '') # $3 ftp proxy (optional. defaults to '') -# TODO: autonetwork must be a wrapper that checks $PROXY_HTTP, $PROXY_FTP and $S_DHCP and calls this function target_configure_network() { [ "$1" != dhcp -a "$1" != fixed ] && die_error "target_configure_network \$1 must be 'dhcp' or 'fixed'" PROXY_HTTP="$2" PROXY_FTP="$3" if [ "$1" = fixed ]; then - sed -i "s#eth0=\"eth0#$INTERFACE=\"$INTERFACE#g" ${var_TARGET_DIR}/etc/rc.conf - sed -i "s#$INTERFACE 192.168.0.2#$INTERFACE $IPADDR#g" ${var_TARGET_DIR}/etc/rc.conf - sed -i "s#netmask 255.255.255.0#netmask $SUBNET#g" ${var_TARGET_DIR}/etc/rc.conf - sed -i "s#broadcast 192.168.0.255#broadcast $BROADCAST#g" ${var_TARGET_DIR}/etc/rc.conf - if [ "$GW" != "" ]; then - sed -i "s#gw 192.168.0.1#gw $GW#g" ${var_TARGET_DIR}/etc/rc.conf - sed -i "s#!gateway#gateway#g" ${var_TARGET_DIR}/etc/rc.conf + sed -i "s#eth0=\"eth0#${INTERFACE:-eth0}=\"${INTERFACE:-eth0}#g" ${var_TARGET_DIR}/etc/rc.conf || return 1 + sed -i "s#${INTERFACE:-eth0} 192.168.0.2#${INTERFACE:-eth0} ${IPADDR:-192.168.0.2}#g" ${var_TARGET_DIR}/etc/rc.conf || return 1 + sed -i "s#netmask 255.255.255.0#netmask ${SUBNET:-255.255.255.0}#g" ${var_TARGET_DIR}/etc/rc.conf || return 1 + sed -i "s#broadcast 192.168.0.255#broadcast ${BROADCAST:-192.168.0.255}#g" ${var_TARGET_DIR}/etc/rc.conf || return 1 + if [ -n "$GW" ]; then + sed -i "s#gw 192.168.0.1#gw $GW#g" ${var_TARGET_DIR}/etc/rc.conf || return 1 + sed -i "s#!gateway#gateway#g" ${var_TARGET_DIR}/etc/rc.conf || return 1 + fi + if [ -n "$DNS" ] + then + echo "nameserver $DNS" >> ${var_TARGET_DIR}/etc/resolv.conf || return 1 fi - echo "nameserver $DNS" >> ${var_TARGET_DIR}/etc/resolv.conf else - sed -i "s#eth0=\"eth0.*#$INTERFACE=\"dhcp\"#g" ${var_TARGET_DIR}/etc/rc.conf + sed -i "s#eth0=\"eth0.*#${INTERFACE:-eth0}=\"dhcp\"#g" ${var_TARGET_DIR}/etc/rc.conf || return 1 fi - sed -i "s#INTERFACES=(eth0)#INTERFACES=($INTERFACE)#g" ${var_TARGET_DIR}/etc/rc.conf + sed -i "s#INTERFACES=(eth0)#INTERFACES=(${INTERFACE:-eth0})#g" ${var_TARGET_DIR}/etc/rc.conf || return 1 - if [ "$PROXY_HTTP" != "" ]; then - echo "export http_proxy=$PROXY_HTTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh; - chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh + 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 fi - if [ "$PROXY_FTP" != "" ]; then - echo "export ftp_proxy=$PROXY_FTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh; - chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh + 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 fi } |