Accepting request 234742 from home:trenn:branches:Base:System

- Corrected previous patch
  Modified: 0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch

  Add: 0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch

OBS-URL: https://build.opensuse.org/request/show/234742
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=147

0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch

@@ -1,4 +1,4 @@
-From de29d2c3e203cc435be6b4705734b8ffcea0f7c8 Mon Sep 17 00:00:00 2001
+From 2029fc819675979761968b85526e8b3824f9b97b Mon Sep 17 00:00:00 2001
 From: Hannes Reinecke <hare@suse.de>
 Date: Mon, 19 May 2014 12:25:01 +0200
 Subject: [PATCH] 95fcoe: skip VLAN devices in fcoe-up
@@ -11,16 +11,16 @@ References: bnc#878583
 
 Signed-off-by: Hannes Reinecke <hare@suse.de>
 ---
- modules.d/95fcoe/fcoe-up.sh | 7 +++++++
- 1 file changed, 7 insertions(+)
+ modules.d/95fcoe/fcoe-up.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
-index 9884713..3a2b327 100755
+index 9884713..d362f0e 100755
 --- a/modules.d/95fcoe/fcoe-up.sh
 +++ b/modules.d/95fcoe/fcoe-up.sh
-@@ -20,6 +20,13 @@ dcb=$2
- 
- linkup "$netif"
+@@ -18,6 +18,14 @@ type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
+ netif=$1
+ dcb=$2
  
 +iflink=$(cat /sys/class/net/$netif/iflink)
 +ifindex=$(cat /sys/class/net/$netif/ifindex)
@@ -29,9 +29,10 @@ index 9884713..3a2b327 100755
 +    exit 0
 +fi
 +
- netdriver=$(readlink -f /sys/class/net/$netif/device/driver)
- netdriver=${netdriver##*/}
++ip link set dev $netif up
+ linkup "$netif"
  
+ netdriver=$(readlink -f /sys/class/net/$netif/device/driver)
 -- 
-1.8.5.2
+1.7.12.4
 

dracut.changes

@@ -1,8 +1,15 @@
+-------------------------------------------------------------------
+Mon May 19 16:05:49 UTC 2014 - trenn@suse.de
+
+- Corrected previous patch
+  Modified: 0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch
+
 -------------------------------------------------------------------
 Mon May 19 11:11:42 UTC 2014 - trenn@suse.de
 
 - From Hannes Reinecke <hare@suse.com>:
   skip VLAN devices in fcoe-up (bnc#878583)
+  Add: 0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch
 
 -------------------------------------------------------------------
 Thu May 15 14:07:44 UTC 2014 - trenn@suse.de