[dracut/f17] dracut-018-67.git20120622

[Harald Hoyer]

commit 1011978f6174bc30b78fa9da9866e79dff26fb21
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Jun 22 14:57:22 2012 +0200

    dracut-018-67.git20120622
    
    - add tagged bonding
    Resolves: rhbz#833057
    - fixed shutdown service
    Resolves: rhbz#831634

 0065-network-support-vlan-tagged-bonding.patch     |   71 ++++++++++++++++++++
 ...down.service-fixed-ordering-to-be-before-.patch |   23 ++++++
 dracut.spec                                        |   10 +++-
 3 files changed, 103 insertions(+), 1 deletions(-)
---
diff --git a/0065-network-support-vlan-tagged-bonding.patch b/0065-network-support-vlan-tagged-bonding.patch
new file mode 100644
index 0000000..3f5f4f5
--- /dev/null
+++ b/0065-network-support-vlan-tagged-bonding.patch
@@ -0,0 +1,71 @@
+From 67cb45f6e6666a07e77a908272a20a8a3e8bcba3 Mon Sep 17 00:00:00 2001
+From: Cong Wang <xiyou.wangcong at gmail.com>
+Date: Thu, 21 Jun 2012 11:44:35 +0800
+Subject: [PATCH] network: support vlan tagged bonding
+
+This patch adds support of vlan tagged bonding, for example,
+bond0.2. In case of regression, I also tested bond0 and eth0.2,
+all work fine.
+
+Cc: Harald Hoyer <harald at redhat.com>
+Cc: Dave Young <dyoung at redhat.com>
+Cc: Vivek Goyal <vgoyal at redhat.com>
+Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
+---
+ modules.d/40network/ifup.sh         |    8 ++++++--
+ modules.d/40network/net-genrules.sh |    6 +++---
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index 8b5c27b..b186a4f 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
+@@ -209,7 +209,7 @@ if [ -e /tmp/bridge.info ]; then
+         brctl setfd $bridgename 0
+         for ethname in $ethnames ; do
+             if [ "$ethname" = "$bondname" ] ; then
+-                DO_BOND_SETUP=yes ifup $bondname
++                DO_BOND_SETUP=yes ifup $bondname -m
+             else
+                 ip link set $ethname up
+             fi
+@@ -232,7 +232,11 @@ get_vid() {
+ 
+ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
+     modprobe 8021q
+-    ip link set "$phydevice" up
++    if [ "$phydevice" = "$bondname" ] ; then
++        DO_BOND_SETUP=yes ifup $phydevice -m
++    else
++        ip link set "$phydevice" up
++    fi
+     wait_for_if_up "$phydevice"
+     ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname; echo $?)"
+ fi
+diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
+index d8f8f8d..b79f731 100755
+--- a/modules.d/40network/net-genrules.sh
++++ b/modules.d/40network/net-genrules.sh
+@@ -21,19 +21,19 @@ fix_bootif() {
+     # bridge: attempt only the defined interface
+     if [ -e /tmp/bridge.info ]; then
+         . /tmp/bridge.info
+-        IFACES=${ethnames%% *}
++        IFACES+=" ${ethnames%% *}"
+     fi
+ 
+     # bond: attempt only the defined interface (override bridge defines)
+     if [ -e /tmp/bond.info ]; then
+         . /tmp/bond.info
+         # It is enough to fire up only one
+-        IFACES=${bondslaves%% *}
++        IFACES+=" ${bondslaves%% *}"
+     fi
+ 
+     if [ -e /tmp/vlan.info ]; then
+         . /tmp/vlan.info
+-        IFACES=$phydevice
++        IFACES+=" $phydevice"
+     fi
+ 
+     ifup='/sbin/ifup $env{INTERFACE}'
diff --git a/0066-dracut-shutdown.service-fixed-ordering-to-be-before-.patch b/0066-dracut-shutdown.service-fixed-ordering-to-be-before-.patch
new file mode 100644
index 0000000..1bb944f
--- /dev/null
+++ b/0066-dracut-shutdown.service-fixed-ordering-to-be-before-.patch
@@ -0,0 +1,23 @@
+From 6f6910bc5f053ecf1daf5f3742bedd5641310b10 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 20 Jun 2012 18:29:42 +0200
+Subject: [PATCH] dracut-shutdown.service: fixed ordering to be before
+ shutdown.target
+
+---
+ dracut-shutdown.service |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut-shutdown.service b/dracut-shutdown.service
+index 6756355..f96418b 100644
+--- a/dracut-shutdown.service
++++ b/dracut-shutdown.service
+@@ -8,7 +8,7 @@
+ [Unit]
+ Description=Restore /run/initramfs
+ After=getty at tty1.service prefdm.service
+-Before=reboot.service
++Before=reboot.service shutdown.target
+ DefaultDependencies=no
+ ConditionPathExists=/run/initramfs/.need_shutdown
+ ConditionPathExists=!/run/initramfs/bin/sh
diff --git a/dracut.spec b/dracut.spec
index 4b7c782..925d989 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 018
-Release: 65.git20120612%{?dist}
+Release: 67.git20120622%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -88,6 +88,8 @@ Patch61: 0061-Add-doc-for-birdge-cmdline.patch
 Patch62: 0062-Handle-multiple-underlying-devices-of-a-bridge.patch
 Patch63: 0063-url-lib-url-lib.sh-use-silent-mode-for-curl-if-TERM-.patch
 Patch64: 0064-dracut-functions-fixed-return-status-of-instmods.patch
+Patch65: 0065-network-support-vlan-tagged-bonding.patch
+Patch66: 0066-dracut-shutdown.service-fixed-ordering-to-be-before-.patch
 
 
 BuildArch: noarch
@@ -403,6 +405,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Jun 22 2012 Harald Hoyer <harald at redhat.com> 018-67.git20120622
+- add tagged bonding
+Resolves: rhbz#833057
+- fixed shutdown service
+Resolves: rhbz#831634
+
 * Tue Jun 12 2012 Harald Hoyer <harald at redhat.com> 018-65.git20120612
 - revert to "ip=dhcp" by default