Skip to content

Commit 0d29988

Browse files
committed
lib/zfsbootmenu-kcl: clean up argument reading
1 parent 07d6e73 commit 0d29988

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

zfsbootmenu/lib/zfsbootmenu-kcl.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,17 @@ get_zbm_arg() {
216216
[ -n "${1}" ] || return 1
217217
[ -d "${BASE}/cmdline.d" ] || make_cmdline_dir
218218

219-
local kopt
219+
local kopt kval
220220
for kopt in "$@"; do
221-
if [ -f "${BASE}/cmdline.d/${kopt}" ] ; then
222-
head -1 < "${BASE}/cmdline.d/${kopt}"
223-
[ "${kopt}" = "${1}" ] || zwarn "using deprecated arg '${kopt}' when '${1}' is preferred"
224-
return 0
221+
[ -r "${BASE}/cmdline.d/${kopt}" ] || continue
222+
223+
if [ "${kopt}" != "${1}" ]; then
224+
zwarn "using deprecated arg '${kopt}' when '${1}' is preferred"
225225
fi
226+
227+
read -r kval < "${BASE}/cmdline.d/${kopt}"
228+
echo "${kval}"
229+
return 0
226230
done
227231

228232
return 1

0 commit comments

Comments
 (0)