summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Janczyk2010-08-11 21:02:45 +0200
committerMichael Janczyk2010-08-11 21:02:45 +0200
commit4889e7254bb6e7f08060fbeb7421d8d3acae4187 (patch)
tree8c9e0c6dcbad5acbf838204c834ca1992eea2185
parentchanged splashy plugin. vga make no sense any more, kdm is now default manager (diff)
parentUgly quickfix for nwif naming problem (not properly passed via the (diff)
downloadcore-4889e7254bb6e7f08060fbeb7421d8d3acae4187.tar.gz
core-4889e7254bb6e7f08060fbeb7421d8d3acae4187.tar.xz
core-4889e7254bb6e7f08060fbeb7421d8d3acae4187.zip
Merge branch 'master' of openslx.org:openslx/core
-rwxr-xr-xinitramfs/stage3-stuff/init6
1 files changed, 3 insertions, 3 deletions
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 86d9da9c..50bd604c 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -403,15 +403,15 @@ if strinstr "eth" "$nwif" ; then
error "$init_errnwad"
else
# assume a forcedeth problem here (nonmatching MACs)
- error "$init_nveth" nonfatal
macaddr=${bootmac}
fi
break
fi
done
fi
-# hook to setup bridging (several virtualization tools ...)
-
+# quickfix for proper nwif passing ... (to be fixed in a more general way)
+sed "s/nwif=.*/nwif=\"${nwif}\"/" -i /tmp/env/wrapper.env
+# hook to setup bridging (several virtualization tools ...
runinithook '20-nw-bridge-config'
# set up loopback networking