Add keyboard shortcut to remove pinned kernel

* Plumb a key option to unset the default kernel for a BE * Add help documentation, force two column view
zbm-dev · Jun 20, 2021 · 635d140 · 635d140
1 parent 40dd0e3
commit 635d140
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/90zfsbootmenu/help-files/134/kernel-management.pod b/90zfsbootmenu/help-files/134/kernel-management.pod
@@ -14,6 +14,11 @@
 
   The operation will fail gracefully if the pool can not be set [33mread/write[0m.
 
+[33m[MOD+U][0m [1munset default[0m
+  Inherit the ZFS property [33morg.zfsbootmenu:kernel[0m from a parent if present, otherwise unset the property.
+
+  The operation will fail gracefully if the pool can not be set [33mread/write[0m.
+
 [33m[MOD+L][0m [1mview logs[0m
   View logs, as indicated by [33m[!][0m. The indicator will be yellow for warning conditions and red for errors.
 

diff --git a/90zfsbootmenu/help-files/54/kernel-management.pod b/90zfsbootmenu/help-files/54/kernel-management.pod
@@ -19,6 +19,13 @@
   The operation will fail gracefully if the pool can
   not be set [33mread/write[0m.
 
+[33m[MOD+U][0m [1munset default[0m
+  Inherit the ZFS property [33morg.zfsbootmenu:kernel[0m from
+  a parent if present, otherwise unset the property.
+
+  The operation will fail gracefully if the pool can
+  not be set [33mread/write[0m.
+
 [33m[MOD+L][0m [1mview logs[0m
   View logs, as indicated by [33m[!][0m. The indicator will
   be yellow for warning conditions and red for errors.

diff --git a/90zfsbootmenu/help-files/94/kernel-management.pod b/90zfsbootmenu/help-files/94/kernel-management.pod
@@ -16,6 +16,12 @@
 
   The operation will fail gracefully if the pool can not be set [33mread/write[0m.
 
+[33m[MOD+U][0m [1munset default[0m
+  Inherit the ZFS property [33morg.zfsbootmenu:kernel[0m from a parent if present, otherwise unset
+  the property.
+
+  The operation will fail gracefully if the pool can not be set [33mread/write[0m.
+
 [33m[MOD+L][0m [1mview logs[0m
   View logs, as indicated by [33m[!][0m. The indicator will be yellow for warning conditions and red
   for errors.

diff --git a/90zfsbootmenu/zfsbootmenu-lib.sh b/90zfsbootmenu/zfsbootmenu-lib.sh
@@ -524,10 +524,11 @@ draw_kernel() {
 
   zdebug "using kernels file: ${_kernels}"
 
-  header="$( header_wrap "[RETURN] boot" "[ESCAPE] back" "[CTRL+D] set default" "" \
-      "[CTRL+L] view logs" " " "[CTRL+H] help" )"
+  header="$( header_wrap "[RETURN] boot" "[ESCAPE] back" "" \
+    "[CTRL+D] set default" "[CTRL+U] unset default" "" \
+    "[CTRL+L] view logs" "[CTRL+H] help" )"
 
-  expects="--expect=alt-d"
+  expects="--expect=alt-d,alt-u"
 
   if ! selected="$( HELP_SECTION=kernel-management ${FUZZYSEL} \
      --prompt "${benv} > " --tac --with-nth=2 --header="${header}" \

diff --git a/90zfsbootmenu/zfsbootmenu.sh b/90zfsbootmenu/zfsbootmenu.sh
@@ -176,6 +176,9 @@ while true; do
           IFS=' ' read -r fs kpath initrd <<< "${selected_kernel}"
           set_default_kernel "${fs}" "${kpath}"
           ;;
+        "mod-u")
+          set_default_kernel "${fs}"
+          ;;
       esac
       ;;
     "mod-p")

diff --git a/pod/online/kernel-management.pod b/pod/online/kernel-management.pod
@@ -20,6 +20,12 @@ The ZFS property I<org.zfsbootmenu:kernel> is used to store the default kernel f
 
 The operation will fail gracefully if the pool can not be set I<read/write>.
 
+=item I<[MOD+U]> B<unset default>
+
+Inherit the ZFS property I<org.zfsbootmenu:kernel> from a parent if present, otherwise unset the property.
+
+The operation will fail gracefully if the pool can not be set I<read/write>.
+
 =item I<[MOD+L]> B<view logs>
 
 View logs, as indicated by I<[!]>. The indicator will be yellow for warning conditions and red for errors.