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