zfsbootmenu: add kcl-editing helper, use in kernel page too

Author: ahesford

zfsbootmenu/bin/zfsbootmenu

@@ -145,6 +145,9 @@ while true; do
         "mod-u")
           set_default_kernel "${fs}"
           ;;
+        "mod-e")
+          /libexec/zfsbootmenu-edit-kcl -b "${BOOTFS}" -k "${kpath}" "${fs}"
+          ;;
         "left")
           key="mod-s"
           BE_SELECTED=1
@@ -255,26 +258,7 @@ while true; do
       tput cnorm
       ;;
     "mod-e")
-      tput clear
-      tput cnorm
-
-      IFS=$'\t' read -r _ kernel _ <<< "$( select_kernel "${selected_be}" || echo $'-\t-\t-' )"
-      [ "${kernel}" = "-" ] && kernel=""
-
-      echo ""
-      /libexec/zfsbootmenu-preview -b "${BOOTFS}" -k "${kernel}" "${selected_be}"
-
-      BE_ARGS="$( load_be_cmdline "${selected_be}" "${kernel}" )"
-      while IFS= read -r line; do
-        def_args="${line}"
-      done <<< "${BE_ARGS}"
-
-      echo -e "\nNew kernel command line (root= arguments will be ignored)"
-      cmdline="$( /libexec/zfsbootmenu-input "${def_args}" )"
-
-      if [ -n "${cmdline}" ] ; then
-        kcl_tokenize <<< "${cmdline}" | kcl_suppress root > "${BASE}/cmdline"
-      fi
+      /libexec/zfsbootmenu-edit-kcl -b "${BOOTFS}" "${selected_be}"
       ;;
     "mod-t")
       [ -f "${BASE}/cmdline" ] && rm "${BASE}/cmdline"

zfsbootmenu/lib/zfsbootmenu-ui.sh

@@ -203,15 +203,15 @@ draw_kernel() {
   zdebug "using kernels file: ${_kernels}"
 
   header="$( column_wrap "\
-^[RETURN] boot:[ESCAPE] back
-^[CTRL+D] set default:[CTRL+U] unset default
-^[CTRL+L] view logs:[CTRL+H] help" \
+^[RETURN] boot:[CTRL+E] edit kcl:[ESCAPE] back
+^[CTRL+D] set default::[CTRL+U] unset default
+^[CTRL+L] view logs::[CTRL+H] help" \
 "\
 ^[RETURN] boot
 ^[CTRL+D] set default
 ^[CTRL+H] help" )"
 
-  expects="--expect=alt-d,alt-u,left,right"
+  expects="--expect=alt-d,alt-u,alt-e,left,right"
 
   if ! selected="$( HELP_SECTION=kernel-management ${FUZZYSEL} \
       --prompt "${benv} > " --tac --delimiter=$'\t' --with-nth=2 \

zfsbootmenu/libexec/zfsbootmenu-edit-kcl

@@ -0,0 +1,55 @@
+#!/bin/bash
+# vim: softtabstop=2 shiftwidth=2 expandtab
+
+# shellcheck disable=SC1091
+source /lib/profiling-lib.sh >/dev/null 2>&1 || true
+source /etc/zfsbootmenu.conf >/dev/null 2>&1 || exit 1
+source /lib/kmsg-log-lib.sh >/dev/null 2>&1 || exit 1
+source /lib/zfsbootmenu-core.sh >/dev/null 2>&1 || exit 1
+
+BOOTFS=""
+KERNEL=""
+
+while getopts "b:k:" opt; do
+  case "${opt}" in
+    b) BOOTFS="${OPTARG}" ;;
+    k) KERNEL="${OPTARG}" ;;
+    *) ;;
+  esac
+done
+
+shift $((OPTIND - 1))
+
+ENV="${1}"
+
+if [ -z "${KERNEL}" ]; then
+  # shellcheck disable=SC2034
+  read -r _ KERNEL _ <<< "$( select_kernel "${ENV}" || echo $'-\t-\t-' )"
+  [ "${KERNEL}" = "-" ] && KERNEL=""
+fi
+
+# Clear the screen for the prompt
+tput clear
+tput cnorm
+
+# Draw the header for this environment and kernel
+echo ""
+/libexec/zfsbootmenu-preview -b "${BOOTFS}" -k "${KERNEL}" "${ENV}"
+
+# Load the existing command line as the default
+BE_ARGS="$( load_be_cmdline "${ENV}" "${KERNEL}" )" || BE_ARGS=""
+while IFS= read -r line; do
+  default_args="${line}"
+done <<< "${BE_ARGS}"
+
+cat <<EOF
+
+ENTER A NEW KERNEL COMMAND LINE
+  - Interrupt with Ctrl+C or specify an empty line to cancel input
+  - Any "root=" arguments will be ignored
+EOF
+
+cmdline="$( /libexec/zfsbootmenu-input "${default_args}" )" || cmdline=""
+[ -n "${cmdline}" ] || exit 1
+
+kcl_tokenize <<< "${cmdline}" | kcl_suppress root > "${BASE}/cmdline"