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 <javierm@redhat.com>
This commit is contained in:
parent
f9d8ee1b64
commit
4925c9ded9
@ -20,8 +20,6 @@
|
|||||||
# Author(s): tyson@rwii.com
|
# Author(s): tyson@rwii.com
|
||||||
#
|
#
|
||||||
|
|
||||||
[[ -f /etc/default/grub ]] && . /etc/default/grub
|
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: `basename $0` <kernel_version> <bootimage> <mapfile>" >&2
|
echo "Usage: `basename $0` <kernel_version> <bootimage> <mapfile>" >&2
|
||||||
exit 1
|
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/$KERNEL_NAME-$KERNEL_VERSION $LINK_PATH/$KERNEL_NAME
|
||||||
ln -fs ${RELATIVE_PATH}$INSTALL_PATH/System.map-$KERNEL_VERSION $LINK_PATH/System.map
|
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
|
kernel-install add $KERNEL_VERSION $INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION
|
||||||
exit $?
|
exit $?
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user