summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWANG Chao <chaowang@redhat.com>2013-08-12 16:43:52 +0800
committerHarald Hoyer <harald@redhat.com>2013-08-14 15:04:05 +0200
commit613ed5cd764d54cac082a1e7b7e8d1f1fed29d35 (patch)
tree8d3fed7a43e0bf7f75bd0fc7b1d83b1d8ffff4ee
parent3605b485084d5ebaabcafff55963942d7a0d488b (diff)
downloaddracut-613ed5cd764d54cac082a1e7b7e8d1f1fed29d35.tar.gz
dracut-613ed5cd764d54cac082a1e7b7e8d1f1fed29d35.tar.bz2
dracut-613ed5cd764d54cac082a1e7b7e8d1f1fed29d35.zip
network: also wait for ethernet interfaces to setup
We only wait for master interfaces for bridge/bonding/team/vlan case. If none of these complex network is configured, we should wait for ethernet interface (bootdev) instead.
-rwxr-xr-xmodules.d/40network/net-genrules.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index f6b7d9a5..31cd1e67 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