From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 9 Jul 2018 12:19:03 +0200 Subject: [PATCH] Fix grub-switch-to-blscfg boot prefix handling Commit b3ac18e3265f ("grub-switch-to-blscfg.in: Better boot prefix checking") simplified the boot prefix checking, but unfortunately introduced a couple of regressions on the script. Fix them. Signed-off-by: Javier Martinez Canillas --- util/grub-switch-to-blscfg.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in index 2f37a1f740b..40612e00686 100644 --- a/util/grub-switch-to-blscfg.in +++ b/util/grub-switch-to-blscfg.in @@ -220,7 +220,8 @@ EOF for kernelver in $(cd /lib/modules/ ; ls -1) "" ; do bls_target="${blsdir}/${MACHINE_ID}-${kernelver}.conf" - linux="$(grep '^linux[ \t]' "${bls_target}" | sed -e 's,^linux[ \t]+,,')" + linux="/vmlinuz-${kernelver}" + linux_path="/boot${linux}" kernel_dir="/lib/modules/${kernelver}" if [ ! -d "${kernel_dir}" ] ; then @@ -230,8 +231,8 @@ for kernelver in $(cd /lib/modules/ ; ls -1) "" ; do continue fi - linux_relpath="$("${grub_mkrelpath}" "${linux}")" - bootprefix="${linux%%"${linux_relpath}"}" + linux_relpath="$("${grub_mkrelpath}" "${linux_path}")" + bootprefix="${linux_relpath%%"${linux}"}" if [ -f "${kernel_dir}/bls.conf" ] ; then cp -af "${kernel_dir}/bls.conf" "${bls_target}" @@ -243,7 +244,8 @@ for kernelver in $(cd /lib/modules/ ; ls -1) "" ; do fi if [ -n "${bootprefix}" ]; then - sed -i -e "s,\([ \t]\)${bootprefix},\1,g" "${bls_target}" + sed -i -e "s,^\(linux[^ \t]*[ \t]\+\).*,\1${bootprefix}${linux},g" "${bls_target}" + sed -i -e "/^initrd/ s,\([ \t]\+\)\([^ \t]\+\),\1${bootprefix}\2,g" "${bls_target}" fi if [ "x$GRUB_LINUX_MAKE_DEBUG" = "xtrue" ]; then @@ -258,7 +260,7 @@ for kernelver in $(cd /lib/modules/ ; ls -1) "" ; do fi done -if [ -n "${bootprefix}" -a -f "/boot/vmlinuz-0-rescue-${MACHINE_ID}" ]; then +if [ -f "/boot/vmlinuz-0-rescue-${MACHINE_ID}" ]; then mkbls "0-rescue-${MACHINE_ID}" "0" "${bootprefix}" >"${blsdir}/${MACHINE_ID}-0-rescue.conf" fi