dracut/0047-95resume-skip-module-for-s390-x.patch

32 lines
964 B
Diff
Raw Normal View History

From e7d92a233044614bc6eed412abd05dc99432a455 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Mon, 2 Jun 2014 14:46:55 +0200
Subject: [PATCH] 95resume: skip module for s390(x)
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
s390(x) kernels do not support suspend, so there is no need
to include this module.
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
modules.d/95resume/module-setup.sh | 4 ++++
1 file changed, 4 insertions(+)
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
index b1b4684..7f3cf24 100755
--- a/modules.d/95resume/module-setup.sh
+++ b/modules.d/95resume/module-setup.sh
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
@@ -4,6 +4,10 @@
# called by dracut
check() {
+ local _arch=$(uname -m)
+ # No suspend support on s390(x)
+ [ "$_arch" = "s390" -o "$_arch" = "s390x" ] && return 1
+
# No point trying to support resume, if no swap partition exist
[[ $hostonly ]] || [[ $mount_needs ]] && {
for fs in "${host_fs_types[@]}"; do
--
1.8.4.5