d9c684105c
- 95resume: Do not resume on iSCSI devices (bsc#999663) *add 0310-95resume-Do-not-resume-on-iSCSI.patch - 95iscsi: ip=ibft is deprecated (bsc#1004437) *add 0311-95iscsi-ip-ibft-is-deprecated.patch - 40network: do not print warning about non-existing file (bsc#1004437) *add 0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch - 90dmraid: do not delete partitions (bsc#998860) *add 0309-90dmraid-do-not-delete-partitions.patch - Give-persistent_policy-precedence-over-dev-mapper-names (bsc#908143) *add: 0502-persistent_device_policy_param_enhance.patch - mdadm IMSM_NO_PLATFORM workaround for kdump (bsc#975404) *add: 0308-mdraid_add_IMSM_NO_PLATFORM_env.patch OBS-URL: https://build.opensuse.org/request/show/434686 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=268
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 7cafbd9fe0f0799dc1a5c795d716e6732deb47ce Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 13 Oct 2016 09:58:32 +0200
|
|
Subject: [PATCH 1/3] 95resume: Do not resume on iSCSI
|
|
|
|
The iSCSI configuration is started after dracut checks for resume,
|
|
so we run into a timeout here. Additionally it's questionable if
|
|
resume on iSCSI makes sense (or is even supported on the platform),
|
|
so disable it for now.
|
|
|
|
References: bsc#999663
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
---
|
|
modules.d/95resume/module-setup.sh | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
|
|
index 7fe6df3..b11f8e8 100755
|
|
--- a/modules.d/95resume/module-setup.sh
|
|
+++ b/modules.d/95resume/module-setup.sh
|
|
@@ -2,6 +2,11 @@
|
|
|
|
# called by dracut
|
|
check() {
|
|
+ if dracut_module_included "iscsi" ; then
|
|
+ # Do not attempt resume on iscsi
|
|
+ return 255
|
|
+ fi
|
|
+
|
|
# No point trying to support resume, if no swap partition exist
|
|
[[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
for fs in "${host_fs_types[@]}"; do
|
|
--
|
|
2.6.6
|
|
|