From 556eb042be03add84df16451475c1c0de046edd2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 03 2015 11:08:53 +0000
Subject: import dracut-033-360.el7_2


---

diff --git a/SOURCES/0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch b/SOURCES/0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch
index 25f7eef..926e0c9 100644
--- a/SOURCES/0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch
+++ b/SOURCES/0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch
@@ -1,7 +1,7 @@
-From efd5178b6395f4994d005fd437ca916616d2f1ba Mon Sep 17 00:00:00 2001
+From 32398e15250018c908d344060a7d9ab72c4ce5d0 Mon Sep 17 00:00:00 2001
 From: Fedora dracut team <dracut-maint@redhat.com>
 Date: Mon, 19 Oct 2015 18:27:11 +0200
-Subject: [PATCH 358/359] write-ifcfg: fix creating configuration for VLAN
+Subject: [PATCH] write-ifcfg: fix creating configuration for VLAN
 
 Currently the physdev is unset before it is somehow applied.
 Also there is no DEVICE in the output.
@@ -39,6 +39,3 @@ index 1e7f694..f3a1c10 100755
              echo "VLAN=yes"
              echo "PHYSDEV=\"$phydevice\""
          } >> /tmp/ifcfg/ifcfg-$netif
--- 
-2.4.3
-
diff --git a/SOURCES/0359-90qemu-also-add-ibmvscsi-on-qemu.patch b/SOURCES/0359-90qemu-also-add-ibmvscsi-on-qemu.patch
index 63088ef..a07e594 100644
--- a/SOURCES/0359-90qemu-also-add-ibmvscsi-on-qemu.patch
+++ b/SOURCES/0359-90qemu-also-add-ibmvscsi-on-qemu.patch
@@ -1,7 +1,7 @@
-From fda9e5f8571e57d4cdf5e63d48194499e2a90228 Mon Sep 17 00:00:00 2001
+From 50a00707736d39ff8ccbbcff5693e62061373627 Mon Sep 17 00:00:00 2001
 From: Lukas Nykryn <lnykryn@redhat.com>
 Date: Tue, 20 Oct 2015 15:30:12 +0200
-Subject: [PATCH 359/359] 90qemu: also add ibmvscsi on qemu
+Subject: [PATCH] 90qemu: also add ibmvscsi on qemu
 
 Without this module following scenario does not work:
 1. Install the guest with virtio-scsi-pci as system disk and no other
@@ -22,6 +22,3 @@ index 46b7ae2..4dd5a73 100755
 -            virtio_scsi virtio_console spapr-vscsi
 +            virtio_scsi virtio_console spapr-vscsi ibmvscsi
  }
--- 
-2.4.3
-
diff --git a/SOURCES/0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch b/SOURCES/0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch
new file mode 100644
index 0000000..e1aa363
--- /dev/null
+++ b/SOURCES/0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch
@@ -0,0 +1,25 @@
+From d2380720db11dc2220bf8acc251c0e513ff219bc Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Tue, 17 Jul 2012 13:05:11 +0200
+Subject: [PATCH] Don't call udevadm control --exit in systemd mode
+
+This partly reverts commit a43f97c4e35d0d9c7e6e315e11c909e86936e1cc.
+
+(cherry picked from commit 765d8408e9aafa45cd89a039f8b41f85191fd91f)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1276983
+---
+ modules.d/98systemd/dracut-pre-pivot.sh | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh
+index afe3466..4c3eefc 100755
+--- a/modules.d/98systemd/dracut-pre-pivot.sh
++++ b/modules.d/98systemd/dracut-pre-pivot.sh
+@@ -36,6 +36,4 @@ while ! udevadm settle --timeout=0; do
+     [ $cnt -gt 10 ] && break
+ done
+ 
+-udevadm control --exit
+-
+ exit 0
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index 94ed238..e75a054 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 033
-Release: 359%{?dist}
+Release: 360%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -388,6 +388,7 @@ Patch356: 0356-ifcfg-write-ifcfg.sh-don-t-bind-interface-if-physica.patch
 Patch357: 0357-network-ifup.sh-skip-empty-nameserver-values.patch
 Patch358: 0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch
 Patch359: 0359-90qemu-also-add-ibmvscsi-on-qemu.patch
+Patch360: 0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch
 
 
 BuildRequires: bash git
@@ -815,6 +816,10 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Nov 26 2015 Harald Hoyer <harald@redhat.com> - 033-360
+- don't call udevadm control --exit in systemd mode
+Resolves: rhbz#1285686
+
 * Tue Oct 20 2015 Lukáš Nykrýn <lnykryn@redhat.com> - 033-359
 - write-ifcfg: fix creating configuration for VLAN
 Resolves: rhbz#1267311