|
Harald Hoyer |
3610a1 |
From ffbe0373e2751cda7014b3a4024074bdac1c48aa Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
3610a1 |
From: Harald Hoyer <harald@hoyer.xyz>
|
|
Harald Hoyer |
3610a1 |
Date: Mon, 18 Dec 2017 09:01:21 +0100
|
|
Harald Hoyer |
3610a1 |
Subject: [PATCH] Merge pull request #319 from danimo/modules-load.d-hostonly
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
Fix loading of modules in modules-load.d
|
|
Harald Hoyer |
3610a1 |
---
|
|
Harald Hoyer |
3610a1 |
modules.d/00systemd/module-setup.sh | 4 ++--
|
|
Harald Hoyer |
3610a1 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
|
|
Harald Hoyer |
3610a1 |
index d022de65..1ed4b34f 100755
|
|
Harald Hoyer |
3610a1 |
--- a/modules.d/00systemd/module-setup.sh
|
|
Harald Hoyer |
3610a1 |
+++ b/modules.d/00systemd/module-setup.sh
|
|
Harald Hoyer |
3610a1 |
@@ -160,7 +160,7 @@ install() {
|
|
Harald Hoyer |
3610a1 |
}
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
_mods=$(modules_load_get /usr/lib/modules-load.d)
|
|
Harald Hoyer |
3610a1 |
- [[ $_mods ]] && instmods $_mods
|
|
Harald Hoyer |
3610a1 |
+ [[ $_mods ]] && hostonly='' instmods $_mods
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
if [[ $hostonly ]]; then
|
|
Harald Hoyer |
3610a1 |
inst_multiple -H -o \
|
|
Harald Hoyer |
3610a1 |
@@ -180,7 +180,7 @@ install() {
|
|
Harald Hoyer |
3610a1 |
${NULL}
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
_mods=$(modules_load_get /etc/modules-load.d)
|
|
Harald Hoyer |
3610a1 |
- [[ $_mods ]] && instmods $_mods
|
|
Harald Hoyer |
3610a1 |
+ [[ $_mods ]] && hostonly='' instmods $_mods
|
|
Harald Hoyer |
3610a1 |
fi
|
|
Harald Hoyer |
3610a1 |
|
|
Harald Hoyer |
3610a1 |
if ! [[ -e "$initdir/etc/machine-id" ]]; then
|
|
Harald Hoyer |
3610a1 |
|