|
 |
18971c |
From e6ae0c61285a7ff2a5be88b276b8d0b309e0ba2e Mon Sep 17 00:00:00 2001
|
|
|
18971c |
From: Harald Hoyer <harald@redhat.com>
|
|
|
18971c |
Date: Fri, 10 Jun 2016 14:32:48 +0200
|
|
|
18971c |
Subject: [PATCH] network/net-genrules.sh: generate rules for all interfaces
|
|
|
18971c |
|
|
|
18971c |
previously, if "rd.neednet" and bond was specified, only the bond
|
|
|
18971c |
interface was configured.
|
|
|
18971c |
|
|
|
18971c |
https://bugzilla.redhat.com/show_bug.cgi?id=1282680
|
|
|
18971c |
---
|
|
|
18971c |
modules.d/40network/net-genrules.sh | 22 +++++++++-------------
|
|
|
18971c |
1 file changed, 9 insertions(+), 13 deletions(-)
|
|
|
18971c |
|
|
|
18971c |
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
|
|
|
18971c |
index 750a4d7f..526dd5cf 100755
|
|
|
18971c |
--- a/modules.d/40network/net-genrules.sh
|
|
|
18971c |
+++ b/modules.d/40network/net-genrules.sh
|
|
|
18971c |
@@ -16,7 +16,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
|
|
|
18971c |
# bridge: attempt only the defined interface
|
|
|
18971c |
if [ -e /tmp/bridge.info ]; then
|
|
|
18971c |
. /tmp/bridge.info
|
|
|
18971c |
- IFACES="$IFACES ${bridgeslaves%% *}"
|
|
|
18971c |
+ RAW_IFACES="$RAW_IFACES $bridgeslaves"
|
|
|
18971c |
MASTER_IFACES="$MASTER_IFACES $bridgename"
|
|
|
18971c |
fi
|
|
|
18971c |
|
|
|
18971c |
@@ -27,7 +27,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
|
|
|
18971c |
unset bondname
|
|
|
18971c |
. "$i"
|
|
|
18971c |
# It is enough to fire up only one
|
|
|
18971c |
- IFACES="$IFACES ${bondslaves%% *}"
|
|
|
18971c |
+ RAW_IFACES="$RAW_IFACES $bondslaves"
|
|
|
18971c |
MASTER_IFACES="$MASTER_IFACES ${bondname}"
|
|
|
18971c |
done
|
|
|
18971c |
|
|
|
18971c |
@@ -36,15 +36,17 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
|
|
|
18971c |
unset teamslaves
|
|
|
18971c |
unset teammaster
|
|
|
18971c |
. "$i"
|
|
|
18971c |
- IFACES="$IFACES ${teamslaves}"
|
|
|
18971c |
+ RAW_IFACES="$RAW_IFACES ${teamslaves}"
|
|
|
18971c |
MASTER_IFACES="$MASTER_IFACES ${teammaster}"
|
|
|
18971c |
done
|
|
|
18971c |
|
|
|
18971c |
if [ -e /tmp/vlan.info ]; then
|
|
|
18971c |
. /tmp/vlan.info
|
|
|
18971c |
- IFACES="$IFACES $phydevice"
|
|
|
18971c |
+ RAW_IFACES="$RAW_IFACES $phydevice"
|
|
|
18971c |
MASTER_IFACES="$MASTER_IFACES ${vlanname}"
|
|
|
18971c |
fi
|
|
|
18971c |
+ MASTER_IFACES="$(trim "$MASTER_IFACES")"
|
|
|
18971c |
+ RAW_IFACES="$(trim "$RAW_IFACES")"
|
|
|
18971c |
|
|
|
18971c |
if [ -z "$IFACES" ]; then
|
|
|
18971c |
[ -e /tmp/net.ifaces ] && read IFACES < /tmp/net.ifaces
|
|
|
18971c |
@@ -59,10 +61,10 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
|
|
|
18971c |
runcmd="RUN+=\"/sbin/initqueue --name ifup-\$env{INTERFACE} --unique --onetime $ifup\""
|
|
|
18971c |
|
|
|
18971c |
# We have some specific interfaces to handle
|
|
|
18971c |
- if [ -n "$IFACES" ]; then
|
|
|
18971c |
+ if [ -n "${RAW_IFACES}${IFACES}" ]; then
|
|
|
18971c |
echo 'SUBSYSTEM!="net", GOTO="net_end"'
|
|
|
18971c |
echo 'ACTION!="add|change|move", GOTO="net_end"'
|
|
|
18971c |
- for iface in $IFACES; do
|
|
|
18971c |
+ for iface in $IFACES $RAW_IFACES; do
|
|
|
18971c |
case "$iface" in
|
|
|
18971c |
??:??:??:??:??:??) # MAC address
|
|
|
18971c |
cond="ATTR{address}==\"$iface\""
|
|
|
18971c |
@@ -83,13 +85,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
|
|
|
18971c |
done
|
|
|
18971c |
echo 'LABEL="net_end"'
|
|
|
18971c |
|
|
|
18971c |
- if [ -n "$MASTER_IFACES" ]; then
|
|
|
18971c |
- wait_ifaces=$MASTER_IFACES
|
|
|
18971c |
- else
|
|
|
18971c |
- wait_ifaces=$IFACES
|
|
|
18971c |
- fi
|
|
|
18971c |
-
|
|
|
18971c |
- for iface in $wait_ifaces; do
|
|
|
18971c |
+ for iface in $IFACES; do
|
|
|
18971c |
if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
|
|
|
18971c |
echo "[ -f /tmp/net.${iface}.did-setup ]" >$hookdir/initqueue/finished/wait-$iface.sh
|
|
|
18971c |
fi
|