Blame SOURCES/0540-Fix-loading-of-modules-in-modules-load.d.patch

0903d0
From 249dcc61ea2cfb5963c7f9565dcee3405e064c7b Mon Sep 17 00:00:00 2001
0903d0
From: Fabian Vogt <fvogt@suse.com>
0903d0
Date: Fri, 3 Feb 2017 16:02:34 +0100
0903d0
Subject: [PATCH] Fix loading of modules in modules-load.d
0903d0
0903d0
With hostonly enabled, only modules that are currently
0903d0
loaded are included in the initrd. Modules which are
0903d0
explicitly listed in modules-load.d do not need to
0903d0
be filtered that way. Fix for boo#962224.
0903d0
0903d0
Cherry-picked from: 9fd3e045d
0903d0
Resolves: #1547730
0903d0
---
0903d0
 modules.d/98systemd/module-setup.sh | 4 ++--
0903d0
 1 file changed, 2 insertions(+), 2 deletions(-)
0903d0
0903d0
diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
0903d0
index 10beadda..c59cb945 100755
0903d0
--- a/modules.d/98systemd/module-setup.sh
0903d0
+++ b/modules.d/98systemd/module-setup.sh
0903d0
@@ -166,7 +166,7 @@ install() {
0903d0
     }
0903d0
 
0903d0
     _mods=$(modules_load_get /usr/lib/modules-load.d)
0903d0
-    [[ $_mods ]] && instmods $_mods
0903d0
+    [[ $_mods ]] && hostonly='' instmods $_mods
0903d0
 
0903d0
     if [[ $hostonly ]]; then
0903d0
         inst_multiple -o \
0903d0
@@ -181,7 +181,7 @@ install() {
0903d0
             /etc/sysctl.conf
0903d0
 
0903d0
         _mods=$(modules_load_get /etc/modules-load.d)
0903d0
-        [[ $_mods ]] && instmods $_mods
0903d0
+        [[ $_mods ]] && hostonly='' instmods $_mods
0903d0
     fi
0903d0
 
0903d0
     if ! [[ -e "$initdir/etc/machine-id" ]]; then