]> git.ipfire.org Git - thirdparty/grub.git/commit
Cope with / being on a ZFS root dataset
authorColin Watson <cjwatson@ubuntu.com>
Mon, 29 Oct 2018 12:33:37 +0000 (12:33 +0000)
committerDaniel Kiper <daniel.kiper@oracle.com>
Fri, 9 Nov 2018 12:36:52 +0000 (13:36 +0100)
commite720eef6a69bc4acc767d9a4cf8bc939b8b98e11
tree4b49c478023f1eab7d3b279c7104c4bdd2936a3f
parentb71ac53751877dac18cfc091db2e22b805462278
Cope with / being on a ZFS root dataset

If / is on the root dataset in a ZFS pool, then ${bootfs} will be set to
"/" (whereas if it is on a non-root dataset, there will be no trailing
slash).  Passing "root=ZFS=${rpool}/" will fail to boot, but
"root=ZFS=${rpool}" works fine, so strip the trailing slash.

Fixes: https://savannah.gnu.org/bugs/?52746
Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Tested-by: Fejes József <jozsef.fejes@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
util/grub.d/10_linux.in
util/grub.d/20_linux_xen.in