Skip to content

Commit 8e6ca4a

Browse files
committed
set_default_kernel: properly clear default when no kernel is specified
1 parent 7f929f1 commit 8e6ca4a

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

zfsbootmenu/lib/zfsbootmenu-core.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -624,19 +624,20 @@ set_default_kernel() {
624624
fi
625625
zdebug "pool set to ${pool}"
626626

627-
# Strip /boot/ to list only the file
628-
kernel="${2#/boot/}$"
629-
zdebug "kernel set to ${kernel}"
630-
631627
# Make sure the pool is writable
632628
set_rw_pool "${pool}" || return 1
633629
CLEAR_SCREEN=1 load_key "${fs}"
634630

631+
# Strip /boot/ to list only the file
632+
kernel="${2#/boot/}"
633+
635634
# Restore nonspecific default when no kernel specified
636635
if [ -z "$kernel" ]; then
636+
zdebug "clearing default kernel"
637637
zfs inherit org.zfsbootmenu:kernel "${fs}" || return 1
638638
else
639-
zfs set org.zfsbootmenu:kernel="${kernel}" "${fs}" || return 1
639+
zdebug "kernel set to ${kernel}"
640+
zfs set org.zfsbootmenu:kernel="${kernel}$" "${fs}" || return 1
640641
fi
641642

642643
return 0

0 commit comments

Comments
 (0)