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

[Kairui Song]

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 <kasong(a)redhat.com&gt;
    Date:   Thu Jul 5 16:20:04 2018 +0800

        Merge 90-multipath-hostonly and 90-multipath

    commit a695250ec7db21359689e50733c6581a8d211215
    Author: Kairui Song <kasong(a)redhat.com&gt;
    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 c0f1a88..0c3609f 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() {
-- 
2.17.1

[Dave Young]

On 07/26/18 at 03:50pm, Kairui Song wrote:
>  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 <kasong(a)redhat.com&gt;
>      Date:   Thu Jul 5 16:20:04 2018 +0800
>  
>          Merge 90-multipath-hostonly and 90-multipath
>  
>      commit a695250ec7db21359689e50733c6581a8d211215
>      Author: Kairui Song <kasong(a)redhat.com&gt;
>      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 c0f1a88..0c3609f 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() {
>  -- 
>  2.17.1
>  _______________________________________________
>  kexec mailing list -- kexec(a)lists.fedoraproject.org
>  To unsubscribe send an email to kexec-leave(a)lists.fedoraproject.org
>  Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
>  List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
>  List Archives:
> https://lists.fedoraproject.org/archives/list/[e-mail].o...
Acked-by: Dave Young <dyoung(a)redhat.com&gt;

Thanks
Dave