aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-11-30 09:38:01 +0000
committerRoy Marples <roy@marples.name>2007-11-30 09:38:01 +0000
commita6d8b76876ac744e019aa7b172ffee3e75b93d1c (patch)
tree7cc5f106b53724c51b7c1797bdef35ea938b1b94
parent16ad975b2de79f0fa9ae27940598658247bd3c5e (diff)
Ensure that lo0 gets 127.0.0.1/8 with a space separated config
-rw-r--r--README1
-rwxr-xr-xsh/net.sh25
2 files changed, 15 insertions, 11 deletions
diff --git a/README b/README
index 3e96a6d2..5e1c1b7a 100644
--- a/README
+++ b/README
@@ -10,6 +10,7 @@ with every other make too.
You may wish to tweak the installation with the below arguments
LIB=lib64
DESTDIR=/tmp/openrc-image
+PAM=pam
If any of the following files exist then we do not overwrite them
/etc/devd.conf
diff --git a/sh/net.sh b/sh/net.sh
index 31e2bc84..93a04025 100755
--- a/sh/net.sh
+++ b/sh/net.sh
@@ -400,16 +400,6 @@ _load_config() {
local config="$(_get_array "config_${IFVAR}")"
local fallback="$(_get_array fallback_${IFVAR})"
- if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
- [ "${config}" != "null" ] && config="127.0.0.1/8
-${config}"
- else
- if [ -z "${config}" ]; then
- ewarn "No configuration specified; defaulting to DHCP"
- config="dhcp"
- fi
- fi
-
config_index=0
local IFS="$__IFS"
set -- ${config}
@@ -427,9 +417,22 @@ ${config}"
esac
fi
+ # Ensure that loopback has the correct address
+ if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
+ if [ "$1" != "null" ]; then
+ config_0="127.0.0.1/8"
+ config_index=1
+ fi
+ else
+ if [ -z "$1" ]; then
+ ewarn "No configuration specified; defaulting to DHCP"
+ config="dhcp"
+ fi
+ fi
+
+
# We store our config in an array like vars
# so modules can influence it
- config_index=0
for cmd; do
eval config_${config_index}="'${cmd}'"
config_index=$((${config_index} + 1))