pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 494563 from Base:System

Browse Source 
- Revert: "Require version >= 3.18 btrfsprogs, rather than conflicting with
  an older one". Dracut should never depend on optional components (forwarded request 494559 from dmolkentin)

OBS-URL: https://build.opensuse.org/request/show/494563
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=108
This commit is contained in:
Dominique Leuenberger 2017-05-20 12:28:40 +00:00 committed by Git OBS Bridge
commit 9fd2b42259
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0520-Ignore-module-resolution-errors.patch Normal file
View File

@ -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

12
dracut.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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
- 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

4
dracut.spec
View File

@ -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
@ -226,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
@ -424,6 +425,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
%patch517 -p1
%patch518 -p1
%patch519 -p1
%patch520 -p1
%build
%configure\