From 3bca7421ef6ac92461971ea61a982249ede02994e9401e26fd9485215fd21f4a Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Mon, 23 Oct 2017 11:56:26 +0000
Subject: [PATCH] Accepting request 535957 from
 home:dmolkentin:branches:Base:System

- This is to support predictable interface names (boo#960669)
 * adds 0541-Make-sure-70-persistent-net.rules-is-included-in-ini.patch
- Include crc32c Intel module when using btrfs (bsc#1011554)
 * adds 0542-Include-crc32c-intel-module-when-using-btrfs.patch

OBS-URL: https://build.opensuse.org/request/show/535957
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=324
---
 ...sistent-net.rules-is-included-in-ini.patch | 29 +++++++++++++++++++
 ...crc32c-intel-module-when-using-btrfs.patch | 26 +++++++++++++++++
 dracut.changes                                |  9 ++++++
 dracut.spec                                   |  4 +++
 4 files changed, 68 insertions(+)
 create mode 100644 0541-Make-sure-70-persistent-net.rules-is-included-in-ini.patch
 create mode 100644 0542-Include-crc32c-intel-module-when-using-btrfs.patch

diff --git a/0541-Make-sure-70-persistent-net.rules-is-included-in-ini.patch b/0541-Make-sure-70-persistent-net.rules-is-included-in-ini.patch
new file mode 100644
index 0000000..69e84dc
--- /dev/null
+++ b/0541-Make-sure-70-persistent-net.rules-is-included-in-ini.patch
@@ -0,0 +1,29 @@
+From 9ddabe8afc13e0ea038ab5bc8aaf1cffe1c905ed Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Mon, 23 Oct 2017 12:01:43 +0200
+Subject: [PATCH] Make sure 70-persistent-net.rules is included in initramfs
+
+This is to support predictable interface names
+
+Note: This should not be backported.
+
+Reference: boo#960669
+---
+ modules.d/95udev-rules/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
+index 5e3f444d..38f7726c 100755
+--- a/modules.d/95udev-rules/module-setup.sh
++++ b/modules.d/95udev-rules/module-setup.sh
+@@ -38,6 +38,7 @@ install() {
+         60-pcmcia.rules \
+         60-persistent-storage.rules \
+         61-persistent-storage-edd.rules \
++        70-persistent-net.rules \
+         70-uaccess.rules \
+         71-seat.rules \
+         73-seat-late.rules \
+-- 
+2.14.1
+
diff --git a/0542-Include-crc32c-intel-module-when-using-btrfs.patch b/0542-Include-crc32c-intel-module-when-using-btrfs.patch
new file mode 100644
index 0000000..cee0259
--- /dev/null
+++ b/0542-Include-crc32c-intel-module-when-using-btrfs.patch
@@ -0,0 +1,26 @@
+From 3c2699fc3f5602a13ec18a0a07d515847dc11fa9 Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Mon, 23 Oct 2017 13:36:18 +0200
+Subject: [PATCH] Include crc32c-intel module when using btrfs
+
+Reference: bsc#1011554
+---
+ modules.d/90btrfs/module-setup.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
+index 9303dbe2..b0d0058b 100755
+--- a/modules.d/90btrfs/module-setup.sh
++++ b/modules.d/90btrfs/module-setup.sh
+@@ -26,6 +26,8 @@ depends() {
+ # called by dracut
+ installkernel() {
+     instmods btrfs
++    # Make sure btfs can use fast crc32c implementations where available (bsc#1011554)
++    instmods crc32c-intel
+ }
+ 
+ # called by dracut
+-- 
+2.14.1
+
diff --git a/dracut.changes b/dracut.changes
index 494add9..8224161 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Oct 23 10:37:52 UTC 2017 - daniel.molkentin@suse.com
+
+- This is to support predictable interface names (boo#960669)
+ * adds 0541-Make-sure-70-persistent-net.rules-is-included-in-ini.patch 
+
+- Include crc32c Intel module when using btrfs (bsc#1011554)
+ * adds 0542-Include-crc32c-intel-module-when-using-btrfs.patch
+
 -------------------------------------------------------------------
 Tue Oct 17 08:03:22 UTC 2017 - daniel.molkentin@suse.com
 
diff --git a/dracut.spec b/dracut.spec
index 9b74f74..7b07dca 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -222,6 +222,8 @@ Patch537:       0537-dracut-init.sh-ignore-crc32.ko-in-builtin-test.patch
 Patch538:       0538-Enable-core-dumps-with-systemd-from-initrd.patch
 Patch539:       0539-Add-IMA-functionality-fate-323289.patch
 Patch540:       0540-Check-the-proper-variable-for-a-custom-IMA-keys-dire.patch
+Patch541:       0541-Make-sure-70-persistent-net.rules-is-included-in-ini.patch
+Patch542:       0542-Include-crc32c-intel-module-when-using-btrfs.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -480,6 +482,8 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch538 -p1
 %patch539 -p1
 %patch540 -p1
+%patch541 -p1
+%patch542 -p1
 
 %build
 %configure\