Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2014-05-23 08:05:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-05-17
21:46:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-05-23
08:05:23.000000000 +0200
@@ -1,0 +2,20 @@
+Tue May 20 08:59:51 UTC 2014 - tr...@suse.de
+
+- From Hannes Reinecke <h...@suse.com>:
+ fixup rootfs-generator installation path (bnc#878714)
+ Add 0032-98systemd-fixup-rootfs-generator-installation-path.patch
+
+-------------------------------------------------------------------
+Mon May 19 16:05:49 UTC 2014 - tr...@suse.de
+
+- Corrected previous patch
+ Modified: 0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch
+
+-------------------------------------------------------------------
+Mon May 19 11:11:42 UTC 2014 - tr...@suse.de
+
+- From Hannes Reinecke <h...@suse.com>:
+ skip VLAN devices in fcoe-up (bnc#878583)
+ Add: 0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch
+
+-------------------------------------------------------------------
New:
----
0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch
0032-98systemd-fixup-rootfs-generator-installation-path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.NyIcFM/_old 2014-05-23 08:05:25.000000000 +0200
+++ /var/tmp/diff_new_pack.NyIcFM/_new 2014-05-23 08:05:25.000000000 +0200
@@ -65,6 +65,8 @@
Patch41: 0028-95fcoe-update-fcoe-interface-check.patch
Patch42: 0029-95fcoe-start-lldpad-separately.patch
Patch43: 0030-dracut-mkinitd_cleanup_force_host_only_var.patch
+Patch44: 0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch
+Patch45: 0032-98systemd-fixup-rootfs-generator-installation-path.patch
BuildRequires: asciidoc
BuildRequires: bash
@@ -145,6 +147,8 @@
%patch41 -p1
%patch42 -p1
%patch43 -p1
+%patch44 -p1
+%patch45 -p1
%build
%configure\
++++++ 0031-95fcoe-skip-VLAN-devices-in-fcoe-up.patch ++++++
>From 2029fc819675979761968b85526e8b3824f9b97b Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Mon, 19 May 2014 12:25:01 +0200
Subject: [PATCH] 95fcoe: skip VLAN devices in fcoe-up
DCB & fipvlan can only be called on real devices, not VLAN
ones. So skip any VLAN devices which might been added to the
list of network interfaces.
References: bnc#878583
Signed-off-by: Hannes Reinecke <h...@suse.de>
---
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..d362f0e 100755
--- a/modules.d/95fcoe/fcoe-up.sh
+++ b/modules.d/95fcoe/fcoe-up.sh
@@ -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)
+if [ "$iflink" != "$ifindex" ] ; then
+ # Skip VLAN devices
+ exit 0
+fi
+
+ip link set dev $netif up
linkup "$netif"
netdriver=$(readlink -f /sys/class/net/$netif/device/driver)
--
1.7.12.4
++++++ 0032-98systemd-fixup-rootfs-generator-installation-path.patch ++++++
>From 967db9acce1546753d47aff0815f2961291134f1 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Tue, 20 May 2014 10:18:12 +0200
Subject: [PATCH] 98systemd: fixup rootfs-generator installation path
The rootfs-generator was installed in the wrong path
in the initrd, cause it never to be run.
References: bnc#878714
Signed-off-by: Hannes Reinecke <h...@suse.de>
---
modules.d/98systemd/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/98systemd/module-setup.sh
b/modules.d/98systemd/module-setup.sh
index e14ce39..4516b9a 100755
--- a/modules.d/98systemd/module-setup.sh
+++ b/modules.d/98systemd/module-setup.sh
@@ -192,7 +192,7 @@ install() {
inst_script "$moddir/dracut-mount.sh" /bin/dracut-mount
inst_script "$moddir/dracut-pre-pivot.sh" /bin/dracut-pre-pivot
- inst_script "$moddir/rootfs-generator.sh"
/lib/systemd/system-generators/dracut-rootfs-generator
+ inst_script "$moddir/rootfs-generator.sh"
$systemdutildir/system-generators/dracut-rootfs-generator
inst_binary true
ln_r $(type -P true) "/usr/bin/loginctl"
--
1.8.5.2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
