fixed bridge setup

renamed "ethnames" in bridge.info to "bridgeslaves"

fixed ifcfg generation

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index 349530f428a93dcb2a678bd14d0887000b1ef701..41ea63148b7891b7ceb53ea8c1b50ecc910f3fb0 100755 (executable)
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -60,7 +60,7 @@ fi
 # bridge this interface?
 if [ -e /tmp/bridge.info ]; then
     . /tmp/bridge.info
-    for ethname in $ethnames ; do
+    for ethname in $bridgeslaves ; do
         if [ "$netif" = "$ethname" ]; then
             if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
                 : # We need to really setup bond (recursive call)
@@ -236,7 +236,7 @@ if [ -e /tmp/bridge.info ]; then
     if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then
         brctl addbr $bridgename
         brctl setfd $bridgename 0
-        for ethname in $ethnames ; do
+        for ethname in $bridgeslaves ; do
             if [ "$ethname" = "$bondname" ] ; then
                 DO_BOND_SETUP=yes ifup $bondname -m
             elif [ "$ethname" = "$teammaster" ] ; then

diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index af2f09c173a1aaa85494efe43de13026377669c2..a43e3df101a2db34d10ea4d13f7e4e7093209c1a 100755 (executable)
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -16,7 +16,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
     # bridge: attempt only the defined interface
     if [ -e /tmp/bridge.info ]; then
         . /tmp/bridge.info
-        IFACES="$IFACES ${ethnames%% *}"
+        IFACES="$IFACES ${bridgeslaves%% *}"
         MASTER_IFACES="$MASTER_IFACES $bridgename"
     fi
 

diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh
index 8c305c0f7cc6b7a8279800414d8b104ed5dc4004..a91010944260e2fd88191109b426ebdeb3db2336 100755 (executable)
--- a/modules.d/40network/parse-bridge.sh
+++ b/modules.d/40network/parse-bridge.sh
@@ -3,9 +3,9 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 #
 # Format:
-#       bridge=<bridgename>:<ethnames>
+#       bridge=<bridgename>:<bridgeslaves>
 #
-#       <ethnames> is a comma-separated list of physical (ethernet) interfaces
+#       <bridgeslaves> is a comma-separated list of physical (ethernet) interfaces
 #       bridge without parameters assumes bridge=br0:eth0
 #
 
@@ -25,20 +25,20 @@ parsebridge() {
         v=${v#*:}
     done
 
-    unset bridgename ethnames
+    unset bridgename bridgeslaves
     case $# in
-        0)  bridgename=br0; ethnames=$iface ;;
+        0)  bridgename=br0; bridgeslaves=$iface ;;
         1)  die "bridge= requires two parameters" ;;
-        2)  bridgename=$1; ethnames=$(str_replace "$2" "," " ") ;;
+        2)  bridgename=$1; bridgeslaves=$(str_replace "$2" "," " ") ;;
         *)  die "bridge= requires two parameters" ;;
     esac
 }
 
-unset bridgename ethnames
+unset bridgename bridgeslaves
 
 iface=eth0
 
-# Parse bridge for bridgename and ethnames
+# Parse bridge for bridgename and bridgeslaves
 if bridge="$(getarg bridge)"; then
     # Read bridge= parameters if they exist
     if [ -n "$bridge" ]; then
@@ -47,9 +47,9 @@ if bridge="$(getarg bridge)"; then
     # Simple default bridge
     if [ -z "$bridgename" ]; then
         bridgename=br0
-        ethnames=$iface
+        bridgeslaves=$iface
     fi
     echo "bridgename=$bridgename" > /tmp/bridge.info
-    echo "ethnames=\"$ethnames\"" >> /tmp/bridge.info
+    echo "bridgeslaves=\"$bridgeslaves\"" >> /tmp/bridge.info
     return
 fi

diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
index 7e301de2a0f23af6296558cb72c6bf57129d5f58..d920c22fd403fd2c2d536492c4fd10a7ce3b1e6d 100755 (executable)
--- a/modules.d/45ifcfg/write-ifcfg.sh
+++ b/modules.d/45ifcfg/write-ifcfg.sh
@@ -214,6 +214,7 @@ for netup in /tmp/net.*.did-setup ; do
                 echo "SLAVE=yes"
                 echo "MASTER=\"$netif\""
                 echo "NAME=\"$slave\""
+                echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\""
             } >> /tmp/ifcfg/ifcfg-$slave
         done
     fi
@@ -224,44 +225,21 @@ for netup in /tmp/net.*.did-setup ; do
             echo "TYPE=Bridge"
             echo "NAME=\"$netif\""
         } >> /tmp/ifcfg/ifcfg-$netif
-        if [ "$ethname" = "$bondname" ] ; then
-            {
-                echo "# Generated by dracut initrd"
-                echo "DEVICE=\"$bondname\""
-                echo "ONBOOT=yes"
-                echo "NETBOOT=yes"
-                # This variable is an indicator of a bond interface for initscripts
-                echo "BONDING_OPTS=\"$bondoptions\""
-                echo "BRIDGE=\"$netif\""
-                echo "NAME=\"$bondname\""
-            } >> /tmp/ifcfg/ifcfg-$bondname
-            for slave in $bondslaves ; do
-                # write separate ifcfg file for the raw eth interface
-                {
-                    echo "# Generated by dracut initrd"
-                    echo "DEVICE=\"$slave\""
-                    echo "TYPE=Ethernet"
-                    echo "ONBOOT=yes"
-                    echo "NETBOOT=yes"
-                    echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\""
-                    echo "SLAVE=yes"
-                    echo "MASTER=\"$bondname\""
-                    echo "NAME=\"$slave\""
-                } >> /tmp/ifcfg/ifcfg-$slave
-            done
-        else
+        for slave in $bridgeslaves ; do
             # write separate ifcfg file for the raw eth interface
             {
                 echo "# Generated by dracut initrd"
-                echo "DEVICE=\"$ethname\""
+                echo "DEVICE=\"$slave\""
                 echo "TYPE=Ethernet"
                 echo "ONBOOT=yes"
                 echo "NETBOOT=yes"
-                echo "HWADDR=\"$(cat /sys/class/net/$ethname/address)\""
-                echo "BRIDGE=\"$netif\""
-                echo "NAME=\"$ethname\""
-            } >> /tmp/ifcfg/ifcfg-$ethname
-        fi
+                echo "HWADDR=\"$(cat /sys/class/net/$slave/address)\""
+                echo "SLAVE=yes"
+                echo "MASTER=\"$bridgename\""
+                echo "NAME=\"$slave\""
+                echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\""
+            } >> /tmp/ifcfg/ifcfg-$slave
+        done
     fi
     i=1
     for ns in $(getargs nameserver); do