- Rename patches to match git repository: * old: 0013-Correct-paths-for-openSUSE.patch new: 0011-Correct-paths-for-openSUSE.patch * old: 0014-Check-for-plymouth-lib-directories.patch new: 0012-Check-for-plymouth-lib-directories.patch * old: dracut_do_not_update_booloader_if_no_kernel_is_found.patch new: 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch * old: suse_grub_manpage.patch new: 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch * old: replace_dhclient_with_wickedd_dhcp_supplicants.patch new: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch * old: 0015-add-new-s390x-specific-rule-files.patch new: 0016-Add-new-s390x-specific-rule-files.patch * old: change_write_ifcfg_to_suse.patch new: 0017-45ifcfg-use-distro-specific-scripts.patch * old: dracut-fix-whitespace-add-drivers_call.patch new: 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch * old: wait_for_network_race_condition_fix.patch new: 0019-40network-Fix-race-condition-when-wait-for-networks.patch * old: dracut-warpclock_module.patch new: 0020-00warpclock-Set-correct-timezone.patch * old: s390-dcssblk.patch new: 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch * old: dracut-install-persistent-rule.patch new: 0022-95udev-rules-add-persistent-network-rule.patch * old: dracut-really-always-add-autofs4.patch new: 0023-systemd-always-tries-to-load-autofs4.patch * old: mdraid-setup.patch new: 0024-Fixup-mdraid-setup.patch * old: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch OBS-URL: https://build.opensuse.org/request/show/236221 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=156
22 lines
735 B
Diff
22 lines
735 B
Diff
dracut: Do not add resume module on s390(x) arch
|
|
|
|
s390(x) kernels do not support suspend, no need to add this module.
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
|
|
Index: dracut-037/modules.d/95resume/module-setup.sh
|
|
===================================================================
|
|
--- dracut-037.orig/modules.d/95resume/module-setup.sh
|
|
+++ dracut-037/modules.d/95resume/module-setup.sh
|
|
@@ -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
|