summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/initramfs.conf5
-rw-r--r--scripts/functions7
2 files changed, 7 insertions, 5 deletions
diff --git a/conf/initramfs.conf b/conf/initramfs.conf
index 2aa380f..0a108a8 100644
--- a/conf/initramfs.conf
+++ b/conf/initramfs.conf
@@ -58,10 +58,11 @@ BOOT=local
#
# DEVICE: ...
#
-# Specify the network interface, like eth0
+# Specify a specific network interface, like eth0
+# Overriden by optional ip= bootarg
#
-DEVICE=eth0
+DEVICE=
#
# NFSROOT: [ auto | HOST:MOUNT ]
diff --git a/scripts/functions b/scripts/functions
index 88f1bbd..1cc9be6 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -363,10 +363,10 @@ configure_networking()
;;
""|on|any)
# Bring up device
- ipconfig -t ${ROUNDTTT} ${DEVICE}
+ ipconfig -t ${ROUNDTTT} "${DEVICE}"
;;
dhcp|bootp|rarp|both)
- ipconfig -t ${ROUNDTTT} -c ${IP} -d ${DEVICE}
+ ipconfig -t ${ROUNDTTT} -c ${IP} -d "${DEVICE}"
;;
*)
ipconfig -t ${ROUNDTTT} -d $IP
@@ -391,7 +391,8 @@ configure_networking()
# source specific bootdevice
. /tmp/net-${DEVICE}.conf
else
- # source any interface as not exaclty specified
+ # source any interface...
+ # ipconfig should have quit after first response
. /tmp/net-*.conf
fi
}