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

[Thomas Deutschmann]

commit:     5b1e15a3b503253b26a931fa7907d175cb3e08fd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:41: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=5b1e15a3

config_kernel(): rewrite --lvm handling

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

 gen_configkernel.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 27704cf..719f055 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -184,9 +184,10 @@ config_kernel() {
                *) cfg_CONFIG_BLK_DEV_DM=${newcfg_setting}
        esac
 
-       # Make sure lvm modules are on if --lvm
+       # Make sure lvm modules are enabled in the kernel, if --lvm
        if isTrue "${CMD_LVM}"
        then
+               print_info 1 "$(getIndent 1)>> Ensure that required kernel 
options for LVM support are set..."
                cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt 
"${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT")
                case "$cfg_CONFIG_DM_SNAPSHOT" in
                        y|m) ;; # Do nothing
@@ -197,9 +198,12 @@ config_kernel() {
                        y|m) ;; # Do nothing
                        *) cfg_CONFIG_DM_MIRROR=${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_SNAPSHOT" "${cfg_CONFIG_DM_SNAPSHOT}"
                kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_DM_MIRROR" "${cfg_CONFIG_DM_MIRROR}"
+               kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_FILE_LOCKING" "y"
        fi
 
        # Multipath