summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2010-02-18 20:22:23 +0100
committerThomas Bächler <thomas@archlinux.org>2010-02-18 20:22:23 +0100
commit01cfe5572f6cfc172dddc013494511a59a7ed85f (patch)
treeef5a891adb7b579aac55062e0f3a37249e662502
parent8d296c6c778ce84fa03ae7784272019840fac408 (diff)
downloadmkinitcpio-01cfe5572f6cfc172dddc013494511a59a7ed85f.tar.gz
mkinitcpio-01cfe5572f6cfc172dddc013494511a59a7ed85f.tar.xz
Fix NFS backward-compatibility with kinit
NFS options of the style nfsaddrs=* and ip=dhcp (without the long : syntax) used to be supported by kinit, but were undocumented in Arch's help. This change hopefully restores full compatibility with old kinit configurations.
-rw-r--r--hooks/net6
1 files changed, 5 insertions, 1 deletions
diff --git a/hooks/net b/hooks/net
index d2085c7..6022192 100644
--- a/hooks/net
+++ b/hooks/net
@@ -5,9 +5,13 @@ run_hook ()
: > /ip_opts
+ if [ -z "${ip}" -a -n "${nfsaddrs}" ]; the
+ export ip="${nfsaddrs}"
+ fi
+
if [ -n "${ip}" ]; then
# setup network and save some values
- ipconfig "${ip}" | while read line; do
+ ipconfig "ip=${ip}" | while read line; do
# echo ":: ${line}"
if [ "${line#"IP-Config:"}" != "${line}" ]; then
continue