diff options
| author | Michael Biebl <biebl@debian.org> | 2018-12-21 22:06:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-12-21 22:06:22 +0100 |
| commit | 6e866b331d7cd4a5e0759dd160dea6edabd3678e (patch) | |
| tree | 4d24c1ffe4ae946f04d8910956090e8d13aecd9a /src/kernel-install/90-loaderentry.install | |
| parent | b012e92123bdc9fa10c2f079ec5bd9313b23e21a (diff) | |
| download | systemd-6e866b331d7cd4a5e0759dd160dea6edabd3678e.tar.gz | |
New upstream version 240
Diffstat (limited to 'src/kernel-install/90-loaderentry.install')
| -rw-r--r-- | src/kernel-install/90-loaderentry.install | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install index a271cdb8a0..39ec8a69c6 100644 --- a/src/kernel-install/90-loaderentry.install +++ b/src/kernel-install/90-loaderentry.install @@ -19,10 +19,11 @@ MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID BOOT_DIR="/$MACHINE_ID/$KERNEL_VERSION" BOOT_ROOT=${BOOT_DIR_ABS%$BOOT_DIR} -LOADER_ENTRY="$BOOT_ROOT/loader/entries/$MACHINE_ID-$KERNEL_VERSION.conf" if [[ $COMMAND == remove ]]; then - exec rm -f "$LOADER_ENTRY" + rm -f "$BOOT_ROOT/loader/entries/$MACHINE_ID-$KERNEL_VERSION.conf" + rm -f "$BOOT_ROOT/loader/entries/$MACHINE_ID-$KERNEL_VERSION+"*".conf" + exit 0 fi if ! [[ $COMMAND == add ]]; then @@ -63,6 +64,17 @@ if ! [[ ${BOOT_OPTIONS[*]} ]]; then exit 1 fi +if [[ -f /etc/kernel/tries ]]; then + read -r TRIES </etc/kernel/tries + if ! [[ "$TRIES" =~ ^[0-9]+$ ]] ; then + echo "/etc/kernel/tries does not contain an integer." >&2 + exit 1 + fi + LOADER_ENTRY="$BOOT_ROOT/loader/entries/$MACHINE_ID-$KERNEL_VERSION+$TRIES.conf" +else + LOADER_ENTRY="$BOOT_ROOT/loader/entries/$MACHINE_ID-$KERNEL_VERSION.conf" +fi + cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS/linux" && chown root:root "$BOOT_DIR_ABS/linux" && chmod 0644 "$BOOT_DIR_ABS/linux" || { |