fixup! zfsbootmenu: support per-kernel command-line arguments

Author: ahesford

zfsbootmenu/lib/zfsbootmenu-core.sh

@@ -329,7 +329,7 @@ mount_zfs() {
   fi
 
   # zfsutil is required for non-legacy mounts and omitted for legacy mounts or snapshots
-  if [ "$(zfs get -H -o value mountpoint "${fs}")" = "legacy" ] || is_snapshot "${fs}" ; then
+  if [ "$( zfs get -H -o value mountpoint "${fs}" )" = "legacy" ] || is_snapshot "${fs}" ; then
     zdebug "mounting ${fs} at ${mnt} (${rwo})"
     mount -o "${rwo}" -t zfs "${fs}" "${mnt}"
     ret=$?
@@ -1143,8 +1143,8 @@ load_be_cmdline() {
   # Nothing is added by default
   adds=()
 
-  args="$( read_kcl_file "${fs}" "${kern_kcl}" )" || args=""
-  args="$(kcl_tokenize <<< "${args}")" || args=""
+  args="$( read_kcl_value "${fs}" "${kern_kcl}" )" || args=""
+  args="$( kcl_tokenize <<< "${args}" )" || args=""
 
   # Use a very basic default KCL if none is specified
   [ -n "${args}" ] || args="quiet loglevel=4"
@@ -1848,7 +1848,7 @@ cache_key() {
   fi
 
   relkeyloc=""
-  if ksmount="$(zfs get -o value -H mountpoint "${keysrc}" 2>/dev/null )"; then
+  if ksmount="$( zfs get -o value -H mountpoint "${keysrc}" 2>/dev/null )"; then
     case "${ksmount}" in
       none|legacy)
         zdebug "no discernable mountpoint for ${keysrc}, using only absolute key path"
@@ -2064,8 +2064,8 @@ emergency_shell() {
   cat <<-EOF
 	$( colorize green "emergency shell")${1:+: $1}
 
-	type '$(colorize red "help")' for online documentation
-	type '$( colorize red "exit")' to return to ZFSBootMenu
+	type '$( colorize red "help" )' for online documentation
+	type '$( colorize red "exit" )' to return to ZFSBootMenu
 
 	EOF
 
@@ -2239,7 +2239,7 @@ is_mountpoint() {
     return
   fi
 
-  if ! mount_path="$(readlink -f "${1}")"; then
+  if ! mount_path="$( readlink -f "${1}" )"; then
     zerror "parent of ${1} does not exist"
     return 1
   fi
@@ -2251,7 +2251,7 @@ is_mountpoint() {
 
   # shellcheck disable=SC2034
   while read -r dev path opts; do
-    path="$(readlink -f "${path}")" || continue
+    path="$( readlink -f "${path}" )" || continue
     [ "${path}" = "${mount_path}" ] && return 0
   done < /proc/self/mounts
 

zfsbootmenu/lib/zfsbootmenu-kcl.sh

@@ -107,7 +107,7 @@ read_kcl_prop() {
 # prints: value of command line, with %{parent} expanded from ZFS property
 # returns: 0 on success
 
-read_kcl_file() {
+read_kcl_value() {
   local zfsbe kclfile args par_args
 
   zfsbe="${1}"