Merge "Fixed a network setup issue for F19"

This commit is contained in:
Jenkins 2013-08-25 22:35:10 +00:00 committed by Gerrit Code Review
commit 6687bdd267
2 changed files with 32 additions and 3 deletions

View File

@ -0,0 +1,19 @@
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index f6b7d9a..31cd1e6 100755
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -74,7 +74,13 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
done
echo 'LABEL="net_end"'
- for iface in $MASTER_IFACES; do
+ if [ -n "$MASTER_IFACES" ]; then
+ wait_ifaces=$MASTER_IFACES
+ else
+ wait_ifaces=$IFACES
+ fi
+
+ for iface in $wait_ifaces; do
if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
fi

View File

@ -1,6 +1,16 @@
#!/bin/sh #!/bin/sh
# If the patch doesn't apply just do nothing. This patch fix a small # If the patch doesn't apply just do nothing. This patch fixes a small
# issue in the script that writes the network configuration files from # issue in the script that writes the network configuration files from
# the cmdline to the disk on FC18. # the cmdline to the disk on FC18/FC19.
patch /usr/lib/dracut/modules.d/45ifcfg/write-ifcfg.sh < $(dirname $0)/../dracut-write-ifcfg.patch || true #
#for dracut-network 029 we need a different patch:
# http://git.kernel.org/cgit/boot/dracut/dracut.git/commit/?id=613ed5cd764d54cac082a1e7b7e8d1f1fed29d35
IFCFG_FILE="/usr/lib/dracut/modules.d/45ifcfg/write-ifcfg.sh"
NETGEN_FILE="/usr/lib/dracut/modules.d/40network/net-genrules.sh"
if patch --dry-run $NETGEN_FILE < $(dirname $0)/../dracut-029-netgen.patch > /dev/null; then
patch $NETGEN_FILE < $(dirname $0)/../dracut-029-netgen.patch || true
else
patch $IFCFG_FILE < $(dirname $0)/../dracut-write-ifcfg.patch || true
fi