avatar
alex has added e9a6928608
backport patch 540
view file @ e9a6928608
... ... --- /dev/null
... ... +++ b/0540-Fix-loading-of-modules-in-modules-load.d.patch
... ... @@ -0,0 +1,38 @@
1
From 249dcc61ea2cfb5963c7f9565dcee3405e064c7b Mon Sep 17 00:00:00 2001
2
From: Fabian Vogt <fvogt@suse.com>
3
Date: Fri, 3 Feb 2017 16:02:34 +0100
4
Subject: [PATCH] Fix loading of modules in modules-load.d
5
6
With hostonly enabled, only modules that are currently
7
loaded are included in the initrd. Modules which are
8
explicitly listed in modules-load.d do not need to
9
be filtered that way. Fix for boo#962224.
10
11
Cherry-picked from: 9fd3e045d
12
Resolves: #1547730
13
---
14
 modules.d/98systemd/module-setup.sh | 4 ++--
15
 1 file changed, 2 insertions(+), 2 deletions(-)
16
17
diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
18
index 10beadda..c59cb945 100755
19
--- a/modules.d/98systemd/module-setup.sh
20
+++ b/modules.d/98systemd/module-setup.sh
21
@@ -166,7 +166,7 @@ install() {
22
     }
23
 
24
     _mods=$(modules_load_get /usr/lib/modules-load.d)
25
-    [[ $_mods ]] && instmods $_mods
26
+    [[ $_mods ]] && hostonly='' instmods $_mods
27
 
28
     if [[ $hostonly ]]; then
29
         inst_multiple -o \
30
@@ -181,7 +181,7 @@ install() {
31
             /etc/sysctl.conf
32
 
33
         _mods=$(modules_load_get /etc/modules-load.d)
34
-        [[ $_mods ]] && instmods $_mods
35
+        [[ $_mods ]] && hostonly='' instmods $_mods
36
     fi
37
 
38
     if ! [[ -e "$initdir/etc/machine-id" ]]; then
... ... --- a/dracut.spec
... ... +++ b/dracut.spec
... ... @@ -10,7 +10,7 @@
10 10
11 11
Name: dracut
12 12
Version: 033
13
Release: 535%{?dist}
13
Release: 535%{?dist}c
14 14
15 15
Summary: Initramfs generator using udev
16 16
%if 0%{?fedora} || 0%{?rhel}
... ... @@ -563,6 +563,7 @@ Patch531: 0531-Align-dev_unit_name-with-systemd-s-function.patch
563 563
Patch532: 0532-base-dracut-lib.sh-remove-bashism.patch
564 564
Patch533: 0533-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
565 565
Patch534: 0534-90lvm-always-add-dm-snapshot.patch
566
Patch540: 0540-Fix-loading-of-modules-in-modules-load.d.patch
566 567
567 568
568 569
BuildRequires: bash git

Comments