Hello community,

here is the log from the commit of package dracut for openSUSE:Factory checked 
in at 2017-05-20 14:28:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
 and      /work/SRC/openSUSE:Factory/.dracut.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dracut"

Sat May 20 14:28:40 2017 rev:108 rq:494563 version:044

Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes    2017-05-10 
20:32:15.957361650 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes       2017-05-20 
14:28:43.325689514 +0200
@@ -1,0 +2,12 @@
+Thu May 11 09:55:53 UTC 2017 - daniel.molken...@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.molken...@suse.com
+
+- Ignore module resolution errors (e.g. with kgraft) (bsc#1037120)
+  * adds 0520-Ignore-module-resolution-errors.patch
+
+-------------------------------------------------------------------

New:
----
  0520-Ignore-module-resolution-errors.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.vcVDT1/_old  2017-05-20 14:28:45.865330196 +0200
+++ /var/tmp/diff_new_pack.vcVDT1/_new  2017-05-20 14:28:45.869329630 +0200
@@ -199,6 +199,7 @@
 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
@@ -226,7 +227,7 @@
 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
@@ -424,6 +425,7 @@
 %patch517 -p1
 %patch518 -p1
 %patch519 -p1
+%patch520 -p1
 
 %build
 %configure\

++++++ 0520-Ignore-module-resolution-errors.patch ++++++
>From 7ede212132383c7f4a6624f3d1e999f1a4a70bb4 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolken...@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


Reply via email to