Skip to content

Commit 9368171

Browse files
committed
Accept any root= value as valid
1 parent 7982971 commit 9368171

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

‎zfsbootmenu/hook/zfsbootmenu-parse-commandline.sh‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,6 @@ fi
212212

213213
wait_for_zfs=0
214214
case "${root}" in
215-
""|zfsbootmenu|zfsbootmenu:)
216-
# We'll take root unset, root=zfsbootmenu, or root=zfsbootmenu:
217-
root="zfsbootmenu"
218-
# shellcheck disable=SC2034
219-
rootok=1
220-
wait_for_zfs=1
221-
222-
zinfo "enabling menu after udev settles"
223-
;;
224215
zfsbootmenu:POOL=*)
225216
# Prefer a specific pool for bootfs value, root=zfsbootmenu:POOL=zroot
226217
root="${root#zfsbootmenu:POOL=}"
@@ -230,6 +221,14 @@ case "${root}" in
230221

231222
zinfo "preferring ${root} for bootfs"
232223
;;
224+
*)
225+
root="zfsbootmenu"
226+
# shellcheck disable=SC2034
227+
rootok=1
228+
wait_for_zfs=1
229+
230+
zinfo "enabling menu after udev settles"
231+
;;
233232
esac
234233

235234
# Pool preference ending in ! indicates a hard requirement

0 commit comments

Comments
 (0)