[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     01237a2d28e1dfdbf910ecf1da342abe8cfc9408
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:43:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=01237a2d

config_kernel(): rewrite --multipath handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 719f055..b0faeeb 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -206,9 +206,10 @@ config_kernel() {
                kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_FILE_LOCKING" "y"
        fi
 
-       # Multipath
+       # Make sure multipath modules are enabled in the kernel, if --multipath
        if isTrue "${CMD_MULTIPATH}"
        then
+               print_info 1 "$(getIndent 1)>> Ensure that required kernel 
options for multipath support are set..."
                cfg_CONFIG_DM_MULTIPATH=$(kconfig_get_opt 
"${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH")
                case "$cfg_CONFIG_DM_MULTIPATH" in
                        y|m) ;; # Do nothing
@@ -219,9 +220,10 @@ config_kernel() {
                        y|m) ;; # Do nothing
                        *) cfg_CONFIG_DM_MULTIPATH_RDAC=${newcfg_setting}
                esac
+               kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
+               kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
                kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
                kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}"
-               kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_DM_MULTIPATH_RDAC" "${cfg_CONFIG_DM_MULTIPATH_RDAC}"
        fi
 
        # Make sure dmraid modules are on if --dmraid