Accepting request 434686 from home:hreinecke:branches:Base:System
- 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
This commit is contained in:
Thomas Renninger
Git OBS Bridge
parent
3ca4ad45d0
commit
d9c684105c
12
0308-mdraid_add_IMSM_NO_PLATFORM_env.patch
Normal file
12
0308-mdraid_add_IMSM_NO_PLATFORM_env.patch
Normal file
@ -0,0 +1,12 @@
|
||||
Index: dracut-044/modules.d/90mdraid/parse-md.sh
|
||||
===================================================================
|
||||
--- dracut-044.orig/modules.d/90mdraid/parse-md.sh 2015-11-25 14:22:28.000000000 +0100
|
||||
+++ dracut-044/modules.d/90mdraid/parse-md.sh 2016-10-07 15:23:20.122868317 +0200
|
||||
@@ -19,6 +19,7 @@ else
|
||||
done;
|
||||
printf 'GOTO="md_end"\n'
|
||||
printf 'LABEL="md_uuid_ok"\n'
|
||||
+ printf 'ENV{IMSM_NO_PLATFORM}="1"'
|
||||
else
|
||||
echo "$line"
|
||||
fi
|
||||
33
0309-90dmraid-do-not-delete-partitions.patch
Normal file
33
0309-90dmraid-do-not-delete-partitions.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From ec36a74a94d7d96670c25c89cffbbca1e964df0b Mon Sep 17 00:00:00 2001
|
||||
From: Hannes Reinecke <hare@suse.de>
|
||||
Date: Tue, 27 Sep 2016 16:38:36 +0200
|
||||
Subject: [PATCH] 90dmraid: do not delete partitions
|
||||
|
||||
There is no point trying to delete partitions; dmraid works
|
||||
happily even with them. On the contrary trying to delete partitions
|
||||
can even be harmful when eg dmraid should _not_ be started.
|
||||
|
||||
References: bsc#998860
|
||||
|
||||
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
||||
---
|
||||
modules.d/90dmraid/61-dmraid-imsm.rules | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
|
||||
index 0193fbc..406cebd 100644
|
||||
--- a/modules.d/90dmraid/61-dmraid-imsm.rules
|
||||
+++ b/modules.d/90dmraid/61-dmraid-imsm.rules
|
||||
@@ -21,9 +21,6 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_end"
|
||||
PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/dm-[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
|
||||
GOTO="dm_end"
|
||||
|
||||
-ENV{DEVTYPE}!="partition", \
|
||||
- RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
|
||||
-
|
||||
RUN+="/sbin/initqueue --onetime --unique --settled /sbin/dmraid_scan $env{DEVNAME}"
|
||||
|
||||
LABEL="dm_end"
|
||||
--
|
||||
2.6.6
|
||||
|
||||
36
0310-95resume-Do-not-resume-on-iSCSI.patch
Normal file
36
0310-95resume-Do-not-resume-on-iSCSI.patch
Normal file
@ -0,0 +1,36 @@
|
||||
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
|
||||
|
||||
31
0311-95iscsi-ip-ibft-is-deprecated.patch
Normal file
31
0311-95iscsi-ip-ibft-is-deprecated.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From d6ad4e35af406a344fd1a1a3e872e941e7e59c86 Mon Sep 17 00:00:00 2001
|
||||
From: Hannes Reinecke <hare@suse.de>
|
||||
Date: Thu, 13 Oct 2016 10:00:49 +0200
|
||||
Subject: [PATCH 2/3] 95iscsi: ip=ibft is deprecated
|
||||
|
||||
Upstream deprecated 'ip=ibft', so update module-setup.sh to
|
||||
emit the correct command-line argument.
|
||||
|
||||
References: bsc#1004437
|
||||
|
||||
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
||||
---
|
||||
modules.d/95iscsi/module-setup.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
|
||||
index e272b24..d6521f0 100755
|
||||
--- a/modules.d/95iscsi/module-setup.sh
|
||||
+++ b/modules.d/95iscsi/module-setup.sh
|
||||
@@ -61,7 +61,7 @@ install_ibft() {
|
||||
fi
|
||||
if [ -d ${d}/initiator ] ; then
|
||||
if [ ${d##*/} = "ibft" ] && [ "$ibft_mod" != "bnx2i" ] ; then
|
||||
- echo -n "ip=ibft "
|
||||
+ echo -n "rd.iscsi.ibft=1 "
|
||||
fi
|
||||
echo -n "rd.iscsi.firmware=1"
|
||||
fi
|
||||
--
|
||||
2.6.6
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
From cc2bdf6b3bf0fcaa6597ee652c024027da24b501 Mon Sep 17 00:00:00 2001
|
||||
From: Hannes Reinecke <hare@suse.de>
|
||||
Date: Thu, 13 Oct 2016 10:27:57 +0200
|
||||
Subject: [PATCH 3/3] 40network: Do not print message about /tmp/net.ibft0.conf
|
||||
not found
|
||||
|
||||
We need to check if the file /tmp/net.X.conf exists before trying
|
||||
to read from it; not doing so will create a warning during boot.
|
||||
|
||||
References: bsc#1004437
|
||||
|
||||
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
||||
---
|
||||
modules.d/40network/ifup.sh | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
||||
index a4515d1..a684cba 100755
|
||||
--- a/modules.d/40network/ifup.sh
|
||||
+++ b/modules.d/40network/ifup.sh
|
||||
@@ -506,10 +506,12 @@ for p in $(getargs ip=); do
|
||||
[ "$autoconf" = "ibft" ] && continue
|
||||
|
||||
# skip if same configuration appears twice
|
||||
- while read line
|
||||
- do
|
||||
- [ "$line" = "$p" ] && continue 2
|
||||
- done < /tmp/net.${netif}.conf
|
||||
+ if [ -f /tmp/net.${netif}.conf ] ; then
|
||||
+ while read line
|
||||
+ do
|
||||
+ [ "$line" = "$p" ] && continue 2
|
||||
+ done < /tmp/net.${netif}.conf
|
||||
+ fi
|
||||
|
||||
echo $p >> /tmp/net.${netif}.conf
|
||||
|
||||
--
|
||||
2.6.6
|
||||
|
||||
58
0502-persistent_device_policy_param_enhance.patch
Normal file
58
0502-persistent_device_policy_param_enhance.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From: Martin Wilck <mwilck@suse.de>
|
||||
Date: Wed, 5 Oct 2016 13:54:26 +0200
|
||||
Subject: [RFC/PATCH] Give --persistent_policy precedence over /dev/mapper names
|
||||
|
||||
There is currently no way to override dracut's preference for
|
||||
/dev/mapper device names. But using these is problematic in
|
||||
different scenarios: For example, if a user has a multipath-
|
||||
enabled system but wants to disable multipath, or if the
|
||||
names of multipath maps change because of configuration changes
|
||||
(e.g. toggling user_friendly_names in /etc/multipath.conf).
|
||||
|
||||
This patch makes dracut prefer the user-specified
|
||||
--persistent_policy names over /dev/mapper names.
|
||||
|
||||
It might be worthwhile to discuss why dracut prefers /dev/mapper
|
||||
of /dev/disk/by-uuid at all. This preference was introduced
|
||||
in 9037b63e with the argument "dm devices maintain /dev/mapper/* as
|
||||
persistent names", but that's wrong for the scenarios mentioned
|
||||
above, and is not a compelling reason for preferring /dev/mapper
|
||||
over /dev/disk/by-uuid.
|
||||
|
||||
References: bsc#908143
|
||||
|
||||
Signed-off-by: Martin Wilck <mwilck@suse.de>
|
||||
---
|
||||
dracut-functions.sh | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||||
index 249d8fb..e97765d 100755
|
||||
--- a/dracut-functions.sh
|
||||
+++ b/dracut-functions.sh
|
||||
@@ -223,14 +223,20 @@ get_devpath_block() {
|
||||
|
||||
# get a persistent path from a device
|
||||
get_persistent_dev() {
|
||||
- local i _tmp _dev
|
||||
+ local i _tmp _dev _pol
|
||||
|
||||
_dev=$(get_maj_min "$1")
|
||||
[ -z "$_dev" ] && return
|
||||
|
||||
+ if [[ -n "$persistent_policy" ]]; then
|
||||
+ _pol="/dev/disk/${persistent_policy}/*"
|
||||
+ else
|
||||
+ _pol=
|
||||
+ fi
|
||||
+
|
||||
for i in \
|
||||
+ $_pol \
|
||||
/dev/mapper/* \
|
||||
- /dev/disk/${persistent_policy:-by-uuid}/* \
|
||||
/dev/disk/by-uuid/* \
|
||||
/dev/disk/by-label/* \
|
||||
/dev/disk/by-partuuid/* \
|
||||
--
|
||||
2.10.0
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 13 10:33:56 CEST 2016 - hare@suse.de
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 10 10:44:17 CEST 2016 - hare@suse.de
|
||||
|
||||
- 90dmraid: do not delete partitions (bsc#998860)
|
||||
*add 0309-90dmraid-do-not-delete-partitions.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 7 13:08:17 UTC 2016 - trenn@suse.de
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 28 15:32:37 CEST 2016 - hare@suse.de
|
||||
|
||||
|
||||
12
dracut.spec
12
dracut.spec
@ -157,6 +157,11 @@ Patch304: 0304-90multipath-Start-daemon-after-udev-settle.patch
|
||||
Patch305: 0305-90multipath-load-dm_multipath-module-during-startup.patch
|
||||
Patch306: 0306-90multipath-add-shutdown-script.patch
|
||||
Patch307: 0307-90multipath-parse-kernel-commandline-option-multipat.patch
|
||||
Patch308: 0308-mdraid_add_IMSM_NO_PLATFORM_env.patch
|
||||
Patch309: 0309-90dmraid-do-not-delete-partitions.patch
|
||||
Patch310: 0310-95resume-Do-not-resume-on-iSCSI.patch
|
||||
Patch311: 0311-95iscsi-ip-ibft-is-deprecated.patch
|
||||
Patch312: 0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch
|
||||
|
||||
# New features/improvements
|
||||
Patch402: 0402-driver-fail-summary.patch
|
||||
@ -166,6 +171,7 @@ Patch404: 0404-dracut-emergency-optionally-print-fs-help.patch
|
||||
# On top patches/fixes which have to be applied late
|
||||
Patch500: 0500-Reset-IFS-variable.patch
|
||||
Patch501: 0501-dasd_fix_ssid_bigger_zero.patch
|
||||
Patch502: 0502-persistent_device_policy_param_enhance.patch
|
||||
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: bash
|
||||
@ -350,6 +356,11 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
|
||||
%patch305 -p1
|
||||
%patch306 -p1
|
||||
%patch307 -p1
|
||||
%patch308 -p1
|
||||
%patch309 -p1
|
||||
%patch310 -p1
|
||||
%patch311 -p1
|
||||
%patch312 -p1
|
||||
|
||||
%patch402 -p1
|
||||
%patch403 -p1
|
||||
@ -357,6 +368,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
|
||||
|
||||
%patch500 -p1
|
||||
%patch501 -p1
|
||||
%patch502 -p1
|
||||
|
||||
%build
|
||||
%configure\
|
||||
|
||||
Loading…
Reference in New Issue
Block a user