From 4925c9ded92d4725da2a2d8be8d913427a8cae5e Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 21 Nov 2018 10:43:48 +0100 Subject: [PATCH] installkernel-bls: remove unnecessary check for GRUB_ENABLE_BLSCFG=true A BLS configuration is the default and in this case the installkernel-bls script is used. For a non-BLS configuration the grubby-deprecated package installs an installkernel that uses the new-kernel-pkg script. So there is no need to check for GRUB_ENABLE_BLSCFG=true. Also, this check is wrong for s390x and was causing the installkernel-bls script to no call kernel-install on this platform. Resolves: rhbz#1647721 Signed-off-by: Javier Martinez Canillas --- installkernel-bls | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/installkernel-bls b/installkernel-bls index d66c44a..f2f607e 100755 --- a/installkernel-bls +++ b/installkernel-bls @@ -20,8 +20,6 @@ # Author(s): tyson@rwii.com # -[[ -f /etc/default/grub ]] && . /etc/default/grub - usage() { echo "Usage: `basename $0` " >&2 exit 1 @@ -79,7 +77,7 @@ cp $MAPFILE $INSTALL_PATH/System.map-$KERNEL_VERSION ln -fs ${RELATIVE_PATH}$INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION $LINK_PATH/$KERNEL_NAME ln -fs ${RELATIVE_PATH}$INSTALL_PATH/System.map-$KERNEL_VERSION $LINK_PATH/System.map -if [ -n "$cfgLoader" ] && [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then +if [ -n "$cfgLoader" ]; then kernel-install add $KERNEL_VERSION $INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION exit $? fi