From e6ca8724c107cec97fb785ef6b2329c72f6cd166 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Nov 27 2015 09:12:31 +0000
Subject: dracut-044-4.git20151127


- fixes for the dmsquash-live module
- remove udev watch for raid members
- mode 0755 for the livenet generator
Resolves: rhbz#1285903

---

diff --git a/0001-dmsquash-live-dmsquash-live-root.sh-fixed-typo.patch b/0001-dmsquash-live-dmsquash-live-root.sh-fixed-typo.patch
new file mode 100644
index 0000000..d551b94
--- /dev/null
+++ b/0001-dmsquash-live-dmsquash-live-root.sh-fixed-typo.patch
@@ -0,0 +1,22 @@
+From 6ed1d9fd07d7b081296aab687e07653f0eb295e3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 26 Nov 2015 15:50:39 +0100
+Subject: [PATCH] dmsquash-live/dmsquash-live-root.sh: fixed typo
+
+---
+ modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+index ffa1e7a..fa44a03 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+@@ -249,7 +249,7 @@ if [ -n "$FSIMG" ] ; then
+         else
+             unpack_archive $FSIMG /run/initramfs/fsimg/
+         fi
+-        FSIMG = /run/initramfs/fsimg/rootfs.img
++        FSIMG=/run/initramfs/fsimg/rootfs.img
+     fi
+     if [ -n "$writable_fsimg" ] || [ -z "$SQUASHED" -a -n "$live_ram" ] ||
+        [ "$overlay" = none -o "$overlay" = None -o "$overlay" = NONE ]; then
diff --git a/0002-dmraid-61-dmraid-imsm.rules-add-nowatch-option-for-u.patch b/0002-dmraid-61-dmraid-imsm.rules-add-nowatch-option-for-u.patch
new file mode 100644
index 0000000..fee2437
--- /dev/null
+++ b/0002-dmraid-61-dmraid-imsm.rules-add-nowatch-option-for-u.patch
@@ -0,0 +1,23 @@
+From 5d8d0ac814e015e4ad35a7e40a92b9f0bb554301 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 26 Nov 2015 17:46:03 +0100
+Subject: [PATCH] dmraid/61-dmraid-imsm.rules: add nowatch option for udev
+
+udev rereads partitions, if watch is set for disks
+---
+ modules.d/90dmraid/61-dmraid-imsm.rules | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
+index 0193fbc..4d4d939 100644
+--- a/modules.d/90dmraid/61-dmraid-imsm.rules
++++ b/modules.d/90dmraid/61-dmraid-imsm.rules
+@@ -16,6 +16,8 @@ ENV{ID_FS_TYPE}=="ddf_raid_member", ENV{rd_NO_MDDDF}!="?*", GOTO="dm_end"
+ 
+ ENV{rd_NO_DM}=="?*", GOTO="dm_end"
+ 
++OPTIONS:="nowatch"
++
+ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_end"
+ 
+ PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/dm-[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
diff --git a/0003-livenet-livenet-generator.sh-mode-0755.patch b/0003-livenet-livenet-generator.sh-mode-0755.patch
new file mode 100644
index 0000000..48b4a63
--- /dev/null
+++ b/0003-livenet-livenet-generator.sh-mode-0755.patch
@@ -0,0 +1,13 @@
+From 88ba9372be6b8011bbf4b59bdc290c62e6d01972 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 27 Nov 2015 09:44:24 +0100
+Subject: [PATCH] livenet/livenet-generator.sh: mode 0755
+
+---
+ modules.d/90livenet/livenet-generator.sh | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 modules.d/90livenet/livenet-generator.sh
+
+diff --git a/modules.d/90livenet/livenet-generator.sh b/modules.d/90livenet/livenet-generator.sh
+old mode 100644
+new mode 100755
diff --git a/dracut.spec b/dracut.spec
index 16f8244..7b2b7ea 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -16,7 +16,7 @@
 
 Name: dracut
 Version: 044
-Release: 1%{?dist}
+Release: 4.git20151127%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -35,6 +35,9 @@ URL: https://dracut.wiki.kernel.org/
 # Source can be generated by
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
 Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
+Patch1: 0001-dmsquash-live-dmsquash-live-root.sh-fixed-typo.patch
+Patch2: 0002-dmraid-61-dmraid-imsm.rules-add-nowatch-option-for-u.patch
+Patch3: 0003-livenet-livenet-generator.sh-mode-0755.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
@@ -495,6 +498,12 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Nov 25 2015 Harald Hoyer <harald@redhat.com> - 044-4.git20151127
+- fixes for the dmsquash-live module
+- remove udev watch for raid members
+- mode 0755 for the livenet generator
+Resolves: rhbz#1285903
+
 * Wed Nov 25 2015 Harald Hoyer <harald@redhat.com> - 044-1
 - version 044