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

Author: ahesford

zfsbootmenu/lib/zfsbootmenu-core.sh

@@ -1122,7 +1122,7 @@ load_be_cmdline() {
   if [ -r "${kern_kcl}" ]; then
     zdebug "found kernel KCL ${kern_kcl} on ${fs}, ignoring KCL cache"
   else
-    cache="$( be_location "${fs}" )/cmdline"
+    cache="$( kernel_kcl_cache "${fs}" "default" )"
   fi
 
   if [ -r "${BASE}/cmdline" ]; then

zfsbootmenu/lib/zfsbootmenu-ui.sh

@@ -651,7 +651,7 @@ populate_be_list() {
   ret=1
   for fs in "${candidates[@]}"; do
     # Remove any existing cmdline cache
-    rm -f "$( be_location "${fs}" )/cmdline"
+    rm -f "$( kernel_kcl_cache "${fs}" "default" )"
 
     # Unlock if necessary
     load_key "${fs}" || continue