From 4eedcae5e1540690a3761857fe2e692774c44960 Mon Sep 17 00:00:00 2001 From: Kairui Song Date: Thu, 26 Jul 2018 15:50:19 +0800 Subject: [PATCH] dracut-module-setup.sh: don't include multipath-hostonly This commit basically reverts commit c755499fad6f48354017f7fbe577e92b4a2bd407, and make use of new introduced tri-state hostonly mode. Following dracut commits merged multipath-hostonly into multipath module, and introduced a tri-state hostonly mode. commit 35e86ac117acbfd699f371f163cdda9db0ebc047 Author: Kairui Song Date: Thu Jul 5 16:20:04 2018 +0800 Merge 90-multipath-hostonly and 90-multipath commit a695250ec7db21359689e50733c6581a8d211215 Author: Kairui Song Date: Wed Jul 4 17:21:37 2018 +0800 Introduce tri-state hostonly mode multipath-hostonly module was introduced only for kdump, because kdump need a more strict hostonly policy for multipath device to save memory. Now multipath module will provide the behave we wanted by setting hostonly mode to strict. --- dracut-module-setup.sh | 8 -------- mkdumprd | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index f87617a..d1f9f5f 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -7,13 +7,6 @@ if ! [[ -d "${initdir}/tmp" ]]; then mkdir -p "${initdir}/tmp" fi -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 -} - check() { [[ $debug ]] && set -x #kdumpctl sets this explicitly @@ -35,7 +28,6 @@ depends() { _dep="$_dep network" fi - for_each_host_dev_and_slaves is_mpath && _dep="$_dep multipath-hostonly" echo $_dep return 0 } diff --git a/mkdumprd b/mkdumprd index 2f71f7b..3d89a80 100644 --- a/mkdumprd +++ b/mkdumprd @@ -37,7 +37,7 @@ is_wdt_addition_needed [[ $? -eq 0 ]] && WDTCFG="-a watchdog" extra_modules="" -dracut_args=("--quiet" "--hostonly" "--hostonly-cmdline" "--hostonly-i18n" "-o" "plymouth dash resume ifcfg" $WDTCFG) +dracut_args=("--quiet" "--hostonly" "--hostonly-cmdline" "--hostonly-i18n" "--hostonly-mode" "strict" "-o" "plymouth dash resume ifcfg" $WDTCFG) OVERRIDE_RESETTABLE=0 add_dracut_arg() {