rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

dracut-module-setup.sh: don't include multipath-hostonly

Browse Source 
This commit basically reverts commit c755499fad,
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 <kasong@redhat.com>
    Date:   Thu Jul 5 16:20:04 2018 +0800

        Merge 90-multipath-hostonly and 90-multipath

    commit a695250ec7db21359689e50733c6581a8d211215
    Author: Kairui Song <kasong@redhat.com>
    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.
This commit is contained in:
Kairui Song 2018-07-26 15:50:19 +08:00 committed by Dave Young
parent 6b479b6572
commit 4eedcae5e1
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dracut-module-setup.sh
View File

@ -7,13 +7,6 @@ if ! [[ -d "${initdir}/tmp" ]]; then
mkdir -p "${initdir}/tmp" mkdir -p "${initdir}/tmp"
fi 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() { check() {
[[ $debug ]] && set -x [[ $debug ]] && set -x
#kdumpctl sets this explicitly #kdumpctl sets this explicitly
@ -35,7 +28,6 @@ depends() {
_dep="$_dep network" _dep="$_dep network"
fi fi
for_each_host_dev_and_slaves is_mpath && _dep="$_dep multipath-hostonly"
echo $_dep echo $_dep
return 0 return 0
} }

2
mkdumprd
View File

@ -37,7 +37,7 @@ is_wdt_addition_needed
[[ $? -eq 0 ]] && WDTCFG="-a watchdog" [[ $? -eq 0 ]] && WDTCFG="-a watchdog"
extra_modules="" 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 OVERRIDE_RESETTABLE=0
add_dracut_arg() { add_dracut_arg() {