c93dfeec7f
IP address is passed as a kernel boot param when booting undercloud machine. For Fedora 19, this IP is not set, instead IP is fetched from DHCP. The problem is caused by a bug in dracut-network version 029, which causes that dracut network setup script is not executed properly. This patch applies a fix for the bug when building undercloud image. Fixes: bug #1213833 Change-Id: Ie94a86ed716044343791628973143c1a7d0778dc
20 lines
735 B
Diff
20 lines
735 B
Diff
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
|