initramfs: Make mountpoint=none work

In initramfs, mount.zfs fails to mount a dataset with mountpoint=none,
but mount.zfs -o zfsutil works.  Use -o zfsutil when mountpoint=none.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #14455
(cherry picked from commit eb823cbc76)
This commit is contained in:
Ryan Moeller 2023-02-06 14:16:01 -05:00 committed by Brian Behlendorf
parent e45a981f6d
commit 8473829d1f
1 changed files with 3 additions and 1 deletions

View File

@ -341,9 +341,11 @@ mount_fs()
# isn't the root fs. # isn't the root fs.
return 0 return 0
fi fi
ZFS_CMD="mount.zfs"
# Last hail-mary: Hope 'rootmnt' is set! # Last hail-mary: Hope 'rootmnt' is set!
mountpoint="" mountpoint=""
if [ "$mountpoint" = "legacy" ]; then
ZFS_CMD="mount.zfs"
fi
else else
mountpoint="$mountpoint1" mountpoint="$mountpoint1"
fi fi