2e0abbdaf2
- FCOE fix bsc#982588 * Add 0212-fcoe_reorder_init_path.patch - Port missing SLES patches * Add 0197-95iscsi-Do-not-require-network-for-qla4xxx-flash-ses.patch * Add 0198-95iscsi-set-rd.iscsi.firmware-for-qla4xxx-sessions.patch * Remove 0194-95iscsi-Do-not-require-network-for-qla4xxx-flash-ses.patch * Remove 0195-95iscsi-set-rd.iscsi.firmware-for-qla4xxx-sessions.patch - Rewrite patch: * Add 0302-Revert-90multipath-add-hostonly-multipath.conf-in-ca.patch * Remove 0001-multipath_revert_mpathconf_binary_use.patch - Update 0403-95lunmask-Add-module-to-handle-LUN-masking.patch to match upstream kernel submission (FATE#319786) - Add IFS restoring where it has been lost due to mainline merging (bsc#977117) *Add 0500-Reset-IFS-variable.patch - Make sure to install collect binary (bsc#976466) * Add: 0188-95dasd_rules-Install-collect-udev-helper-binary.patch - Remove version from requires on subpackage - Add a split provide because of the package split for SLE12 SP1 to SP2 upgrade * 0001-multipath_revert_mpathconf_binary_use.patch (fate#320499) * 0170-iscsi-skip-ibft-invalid-dhcp.patch (bsc#953361) * 0160-s390-update_active_devices_initrd.patch (bsc#939101) * 0161-95zfcp_rules-simplified-rd.zfcp-commandline-for-NPIV.patch (bsc#964456) * 0190-replace-iscsistart-with-systemd-service-files.patch (fate#319024) * 0191-static_network_setup_return_zero.patch (bsc#919179) OBS-URL: https://build.opensuse.org/request/show/400457 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=258
89 lines
2.3 KiB
Diff
89 lines
2.3 KiB
Diff
From c9f18fcc4b7a4b31cc1f68d9e5e1c2d6625871ca Mon Sep 17 00:00:00 2001
|
|
From: Dave Young <dyoung@redhat.com>
|
|
Date: Wed, 4 May 2016 12:46:12 +0200
|
|
Subject: Revert '90multipath: add hostonly multipath.conf in case hostonly
|
|
mode'
|
|
|
|
Patch is incompatible with SUSE, which doesn't have mpathconf.
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
modules.d/90multipath/module-setup.sh | 42 +++++++----------------------------
|
|
1 file changed, 8 insertions(+), 34 deletions(-)
|
|
|
|
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
|
|
index 831c99f..c2c85c4 100755
|
|
--- a/modules.d/90multipath/module-setup.sh
|
|
+++ b/modules.d/90multipath/module-setup.sh
|
|
@@ -1,28 +1,18 @@
|
|
#!/bin/bash
|
|
|
|
-is_mpath() {
|
|
- local _dev=$1
|
|
- [ -e /sys/dev/block/$_dev/dm/uuid ] || return 1
|
|
- [[ $(cat /sys/dev/block/$_dev/dm/uuid) =~ mpath- ]] && return 0
|
|
- return 1
|
|
-}
|
|
-
|
|
-majmin_to_mpath_dev() {
|
|
- local _dev
|
|
- for i in `ls -1 /dev/mapper/mpath*`; do
|
|
- dev=$(get_maj_min $i)
|
|
- if [ "$dev" = "$1" ]; then
|
|
- echo $i
|
|
- return
|
|
- fi
|
|
- done
|
|
-}
|
|
# called by dracut
|
|
check() {
|
|
local _rootdev
|
|
# if there's no multipath binary, no go.
|
|
require_binaries multipath || return 1
|
|
|
|
+ is_mpath() {
|
|
+ local _dev=$1
|
|
+ [ -e /sys/dev/block/$_dev/dm/uuid ] || return 1
|
|
+ [[ $(cat /sys/dev/block/$_dev/dm/uuid) =~ mpath- ]] && return 0
|
|
+ return 1
|
|
+ }
|
|
+
|
|
[[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
for_each_host_dev_and_slaves is_mpath || return 255
|
|
}
|
|
@@ -89,18 +79,7 @@ installkernel() {
|
|
|
|
# called by dracut
|
|
install() {
|
|
- local _f _allow
|
|
- add_hostonly_mpath_conf() {
|
|
- is_mpath $1 && {
|
|
- local _dev
|
|
-
|
|
- _dev=$(majmin_to_mpath_dev $1)
|
|
- [ -z "$_dev" ] && return
|
|
- strstr "$_allow" "$_dev" && return
|
|
- _allow="$_allow --allow $_dev"
|
|
- }
|
|
- }
|
|
-
|
|
+ local _f
|
|
inst_multiple -o \
|
|
dmsetup \
|
|
kpartx \
|
|
@@ -114,11 +93,6 @@ install() {
|
|
/etc/multipath.conf \
|
|
/etc/multipath/*
|
|
|
|
- [[ $hostonly ]] && {
|
|
- for_each_host_dev_and_slaves_all add_hostonly_mpath_conf
|
|
- [ -n "$_allow" ] && mpathconf $_allow --outfile ${initdir}/etc/multipath.conf
|
|
- }
|
|
-
|
|
inst $(command -v partx) /sbin/partx
|
|
|
|
inst_libdir_file "libmultipath*" "multipath/*"
|
|
--
|
|
2.6.6
|
|
|