233f49d9a7
Modify 0017-45ifcfg-use-distro-specific-scripts.patch: - Also revert upstream commit f34e1d6b to not forcibly include network and ifcfg modules (bsc#960669) Refresh: - 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch - 0132-40network-fixup-static-network-configuration.patch - 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch - 0402-driver-fail-summary.patch Add 0209-fix_modules_load_d_hostonly.patch: - Fix modules-load.d with hostonly (boo#962224) OBS-URL: https://build.opensuse.org/request/show/356300 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=248
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From: Fabian Vogt <fvogt@suse.com>
|
|
Subject: Fix loading of modules in modules-load.d
|
|
|
|
With hostonly enabled, only modules that are currently
|
|
loaded are included in the initrd. Modules which are
|
|
explicitly listed in modules-load.d do not need to
|
|
be filtered that way. Fix for boo#962224.
|
|
|
|
---
|
|
modules.d/00systemd/module-setup.sh | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: dracut-044/modules.d/00systemd/module-setup.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/00systemd/module-setup.sh
|
|
+++ dracut-044/modules.d/00systemd/module-setup.sh
|
|
@@ -154,7 +154,7 @@ install() {
|
|
}
|
|
|
|
_mods=$(modules_load_get /usr/lib/modules-load.d)
|
|
- [[ $_mods ]] && instmods $_mods
|
|
+ [[ $_mods ]] && hostonly='' instmods $_mods
|
|
|
|
if [[ $hostonly ]]; then
|
|
inst_multiple -H -o \
|
|
@@ -169,7 +169,7 @@ install() {
|
|
/etc/sysctl.conf
|
|
|
|
_mods=$(modules_load_get /etc/modules-load.d)
|
|
- [[ $_mods ]] && instmods $_mods
|
|
+ [[ $_mods ]] && hostonly='' instmods $_mods
|
|
fi
|
|
|
|
if ! [[ -e "$initdir/etc/machine-id" ]]; then
|