From 233f49d9a72f757918dd5d63b4962f96f11412247964aa0e3502c40f393edc67 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Wed, 27 Jan 2016 16:45:27 +0000 Subject: [PATCH] Accepting request 356300 from home:favogt:branches:Base:System 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 --- ...-45ifcfg-use-distro-specific-scripts.patch | 38 +++++++++++++------ ...ut-ip-ifname-static-for-static-confi.patch | 2 +- ...k-fixup-static-network-configuration.patch | 2 +- ...report-error-for-etc-sysconfig-netwo.patch | 8 ++-- 0209-fix_modules_load_d_hostonly.patch | 34 +++++++++++++++++ 0402-driver-fail-summary.patch | 2 +- dracut.changes | 18 +++++++++ dracut.spec | 2 + 8 files changed, 88 insertions(+), 18 deletions(-) create mode 100644 0209-fix_modules_load_d_hostonly.patch diff --git a/0017-45ifcfg-use-distro-specific-scripts.patch b/0017-45ifcfg-use-distro-specific-scripts.patch index 730faf3..00d92cf 100644 --- a/0017-45ifcfg-use-distro-specific-scripts.patch +++ b/0017-45ifcfg-use-distro-specific-scripts.patch @@ -9,12 +9,17 @@ Detect the system flavor and write the ifcfg files accordingly. each upgrade. Handle this in the spec file and a separate write-ifcfg-suse.sh source file + - Also revert upstream commit f34e1d6, to not forcibly include 45ifcfg + and thus the whole network stack (bsc#960669) + Signed-off-by: Hannes Reinecke Modified-by: Thomas Rennigner +Modified-by: Fabian Vogt --- - modules.d/40network/ifup.sh | 1 + - modules.d/45ifcfg/module-setup.sh | 8 +++++++- - 2 files changed, 8 insertions(+), 1 deletion(-) + modules.d/40network/ifup.sh | 1 + + modules.d/40network/module-setup.sh | 7 +++++++ + modules.d/45ifcfg/module-setup.sh | 1 - + 3 files changed, 8 insertions(+), 1 deletion(-) Index: dracut-044/modules.d/40network/ifup.sh =================================================================== @@ -32,18 +37,29 @@ Index: dracut-044/modules.d/45ifcfg/module-setup.sh =================================================================== --- dracut-044.orig/modules.d/45ifcfg/module-setup.sh +++ dracut-044/modules.d/45ifcfg/module-setup.sh -@@ -2,7 +2,13 @@ +@@ -2,7 +2,6 @@ # called by dracut check() { - [[ -d /etc/sysconfig/network-scripts ]] && return 0 -+ local link=$(readlink $moddir/write-ifcfg.sh) -+ [[ "$link" = "write-ifcfg-suse.sh" ]] && \ -+ [[ -d /etc/sysconfig/network ]] && \ -+ return 0 -+ [[ "$link" = "write-ifcfg-redhat.sh" ]] && \ -+ [[ -d /etc/sysconfig/network-scripts ]] && \ -+ return 0 return 255 } +Index: dracut-044/modules.d/40network/module-setup.sh +=================================================================== +--- dracut-044.orig/modules.d/40network/module-setup.sh ++++ dracut-044/modules.d/40network/module-setup.sh +@@ -15,6 +15,13 @@ check() { + # called by dracut + depends() { + echo "kernel-network-modules" ++ local link=$(readlink $moddir/write-ifcfg.sh) ++ [[ "$link" = "write-ifcfg-suse.sh" ]] && \ ++ [[ -d /etc/sysconfig/network ]] && \ ++ echo "ifcfg" ++ [[ "$link" = "write-ifcfg-redhat.sh" ]] && \ ++ [[ -d /etc/sysconfig/network-scripts ]] && \ ++ echo "ifcfg" + return 0 + } + diff --git a/0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch b/0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch index 50d8a8c..59d42a8 100644 --- a/0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch +++ b/0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch @@ -51,7 +51,7 @@ Index: dracut-044/modules.d/40network/module-setup.sh =================================================================== --- dracut-044.orig/modules.d/40network/module-setup.sh +++ dracut-044/modules.d/40network/module-setup.sh -@@ -51,6 +51,10 @@ install() { +@@ -58,6 +58,10 @@ install() { _arch=$(uname -m) diff --git a/0132-40network-fixup-static-network-configuration.patch b/0132-40network-fixup-static-network-configuration.patch index 2f2fbee..b24b70b 100644 --- a/0132-40network-fixup-static-network-configuration.patch +++ b/0132-40network-fixup-static-network-configuration.patch @@ -46,7 +46,7 @@ Index: dracut-044/modules.d/40network/module-setup.sh =================================================================== --- dracut-044.orig/modules.d/40network/module-setup.sh +++ dracut-044/modules.d/40network/module-setup.sh -@@ -53,6 +53,8 @@ install() { +@@ -60,6 +60,8 @@ install() { [[ $hostonly ]] && { inst_multiple /etc/sysconfig/network/ifcfg-* diff --git a/0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch b/0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch index 45f123d..b74f8ea 100644 --- a/0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch +++ b/0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch @@ -9,11 +9,11 @@ Signed-off-by: Julian Wolf modules.d/40network/module-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: dracut-042/modules.d/40network/module-setup.sh +Index: dracut-044/modules.d/40network/module-setup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/module-setup.sh 2015-06-24 18:02:27.950430272 +0200 -+++ dracut-042/modules.d/40network/module-setup.sh 2015-06-24 18:02:28.582466253 +0200 -@@ -53,7 +53,7 @@ install() { +--- dracut-044.orig/modules.d/40network/module-setup.sh ++++ dracut-044/modules.d/40network/module-setup.sh +@@ -60,7 +60,7 @@ install() { [[ $hostonly ]] && { inst_multiple /etc/sysconfig/network/ifcfg-* diff --git a/0209-fix_modules_load_d_hostonly.patch b/0209-fix_modules_load_d_hostonly.patch new file mode 100644 index 0000000..4b9e5bc --- /dev/null +++ b/0209-fix_modules_load_d_hostonly.patch @@ -0,0 +1,34 @@ +From: Fabian Vogt +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 diff --git a/0402-driver-fail-summary.patch b/0402-driver-fail-summary.patch index f8faf89..e644750 100644 --- a/0402-driver-fail-summary.patch +++ b/0402-driver-fail-summary.patch @@ -76,7 +76,7 @@ Index: dracut-044/dracut.sh rearrange_params "$@" eval set -- "$TEMP" -@@ -1740,6 +1746,15 @@ if ! ( +@@ -1761,6 +1767,15 @@ if ! ( exit 1 fi diff --git a/dracut.changes b/dracut.changes index a101bb3..b314deb 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jan 27 09:19:18 UTC 2016 - fvogt@suse.com + +- 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 + +------------------------------------------------------------------- +Wed Jan 27 07:47:55 UTC 2016 - fvogt@suse.com + +- Add 0209-fix_modules_load_d_hostonly.patch: + - Fix modules-load.d with hostonly (boo#962224) + ------------------------------------------------------------------- Tue Jan 26 11:08:04 UTC 2016 - fvogt@suse.com diff --git a/dracut.spec b/dracut.spec index f4ed4ea..fd3bdaa 100644 --- a/dracut.spec +++ b/dracut.spec @@ -115,6 +115,7 @@ Patch205: 0205-mdraid_ignore_hostonly.patch Patch206: 0206-nfs_dns_alias.patch Patch207: 0207-handle_module_aliases.patch Patch208: 0208-no_forced_virtnet.patch +Patch209: 0209-fix_modules_load_d_hostonly.patch ## SUSE-specific fixes Patch300: 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch @@ -264,6 +265,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh %patch206 -p1 %patch207 -p1 %patch208 -p1 +%patch209 -p1 %patch300 -p1 %patch301 -p1