From 080a64d7d85086f299e55e1a68b656e2dcd380ef67454fe99ad04cc82f00a24f Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Mon, 8 May 2017 15:39:31 +0000
Subject: [PATCH 1/2] - Ignore module resolution errors (e.g. with kgraft)
 (bsc#1037120)   * adds 0520-Ignore-module-resolution-errors.patch

OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=306
---
 0520-Ignore-module-resolution-errors.patch | 25 ++++++++++++++++++++++
 dracut.changes                             |  6 ++++++
 dracut.spec                                |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 0520-Ignore-module-resolution-errors.patch

diff --git a/0520-Ignore-module-resolution-errors.patch b/0520-Ignore-module-resolution-errors.patch
new file mode 100644
index 0000000..1eaca04
--- /dev/null
+++ b/0520-Ignore-module-resolution-errors.patch
@@ -0,0 +1,25 @@
+From 7ede212132383c7f4a6624f3d1e999f1a4a70bb4 Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Mon, 8 May 2017 17:32:11 +0200
+Subject: [PATCH] Ignore module resolution errors
+
+Can occur with version-unique modules names for kgraft.
+
+Reference: bsc#1037120
+
+diff --git a/dracut.sh b/dracut.sh
+index f4794d1d..69833cab 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1237,7 +1237,7 @@ if [[ $hostonly ]]; then
+             host_modules["$alias"]=1
+         done
+         # mod might be an alias in the target kernel, find the real module
+-        mod_filename=$(modinfo -k "$kernel" "$mod" -F filename)
++        mod_filename=$(modinfo -k "$kernel" "$mod" -F filename 2>/dev/null)
+         [ $? -ne 0 ] && continue
+         host_modules["$(basename -s .ko "$mod_filename")"]=1
+     done
+-- 
+2.12.0
+
diff --git a/dracut.changes b/dracut.changes
index c731639..be73443 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May  8 15:34:57 UTC 2017 - daniel.molkentin@suse.com
+
+- Ignore module resolution errors (e.g. with kgraft) (bsc#1037120)
+  * adds 0520-Ignore-module-resolution-errors.patch
+
 -------------------------------------------------------------------
 Wed Apr 26 16:52:29 UTC 2017 - daniel.molkentin@suse.com
 
diff --git a/dracut.spec b/dracut.spec
index c647ea9..7d52907 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -199,6 +199,7 @@ Patch516:       0516-mkinitrd-suse.sh-Fix-prefix-calculation.patch
 Patch517:       0517-95fcoe-fixup-fcoe-genrules.sh-for-VN2VN-mode.patch
 Patch518:       0518-90kernel-modules-Fix-backlight-on-Cherrytrail-device.patch
 Patch519:       0519-90kernel-modules-Ensure-phy-drivers-are-loaded-in-in.patch
+Patch520:       0520-Ignore-module-resolution-errors.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -424,6 +425,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch517 -p1
 %patch518 -p1
 %patch519 -p1
+%patch520 -p1
 
 %build
 %configure\

From a8945d539f5b28c43bc3a39927a0b972d75e8b03ea351fdffdfe3c1df1e99718 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Thu, 11 May 2017 09:57:39 +0000
Subject: [PATCH 2/2] Accepting request 494559 from
 home:dmolkentin:branches:Base:System

- Revert: "Require version >= 3.18 btrfsprogs, rather than conflicting with
  an older one". Dracut should never depend on optional components

OBS-URL: https://build.opensuse.org/request/show/494559
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=307
---
 dracut.changes | 6 ++++++
 dracut.spec    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dracut.changes b/dracut.changes
index be73443..a338796 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 11 09:55:53 UTC 2017 - daniel.molkentin@suse.com
+
+- Revert: "Require version >= 3.18 btrfsprogs, rather than conflicting with
+  an older one". Dracut should never depend on optional components
+
 -------------------------------------------------------------------
 Mon May  8 15:34:57 UTC 2017 - daniel.molkentin@suse.com
 
diff --git a/dracut.spec b/dracut.spec
index 7d52907..b6b2500 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -227,7 +227,7 @@ Requires:       udev > 166
 Requires:       util-linux >= 2.21
 Requires:       xz
 # We use 'btrfs fi usage' that was not present before
-Requires:       btrfsprogs >= 3.18
+Conflicts:      btrfsprogs < 3.18
 Recommends:     logrotate
 Obsoletes:      mkinitrd < 2.8.2
 Provides:       mkinitrd = 2.8.2