summaryrefslogtreecommitdiff
path: root/src/kernel-install
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-04-29 03:07:47 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-04-30 15:37:34 +0900
commit2ff739a6ac4adb44f7ea0f534087ee7276302eee (patch)
tree787eb9e5cf3034f3e04fd9be0f75db6864e464c8 /src/kernel-install
parent65a245c3efa7dca4fac989a007105f738dd6ea02 (diff)
downloadsystemd-2ff739a6ac4adb44f7ea0f534087ee7276302eee.tar.gz
kernel-insteall: do not remove the first slash in $ENTRY_DIR
Follow-up for cd0d230e7bf87f979722de7e364619dfa71bd6a2. Fixes #19456.
Diffstat (limited to 'src/kernel-install')
-rw-r--r--src/kernel-install/90-loaderentry.install6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
index e6c7e99e65..75218d0dee 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -36,7 +36,11 @@ MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
BOOT_ROOT=${ENTRY_DIR_ABS%/$MACHINE_ID/$KERNEL_VERSION}
BOOT_MNT=$(stat -c %m $BOOT_ROOT)
-ENTRY_DIR=${ENTRY_DIR_ABS#$BOOT_MNT}
+if [[ $BOOT_MNT == '/' ]]; then
+ ENTRY_DIR=$ENTRY_DIR_ABS
+else
+ ENTRY_DIR=${ENTRY_DIR_ABS#$BOOT_MNT}
+fi
if [[ $COMMAND == remove ]]; then
rm -f "$BOOT_ROOT/loader/entries/$MACHINE_ID-$KERNEL_VERSION.conf"