initramfs: Fix legacy mountpoint rootfs [2.1.8]

[ghost]

Legacy mountpoint datasets should not pass -o zfsutil to mount.zfs. Fix the logic in mount_fs() to not forget we have a legacy mountpoint when checking for an org.zol:mountpoint userprop.

Reviewed-by: Richard Yao ryao@gentoo.org
Reviewed-by: Brian Behlendorf behlendorf1@llnl.gov
Signed-off-by: Ryan Moeller ryan@iXsystems.com
Closes #14274
(cherry picked from commit 786ff6a)

Motivation and Context

Description

How Has This Been Tested?

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Performance enhancement (non-breaking change which improves efficiency)
• Code cleanup (non-breaking change which makes code smaller or more readable)
• Breaking change (fix or feature that would cause existing functionality to change)
• Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
• Documentation (a change to man pages or other documentation)

Checklist:

• My code follows the OpenZFS code style requirements.
• I have updated the documentation accordingly.
• I have read the contributing document.
• I have added tests to cover my changes.
• I have run the ZFS Test Suite with this change applied.
• All commit messages are properly formatted and contain Signed-off-by.

[fandauchytil]

Hi, there is an issue when attempting to mount a dataset with a mountpoint set to none. The regular command mount.zfs will fail, but it is successful if mount.zfs -o zfsutil is used instead.

This means that the initramfs zfs script will fail if the root DS has its mountpoint set to none:

Command: mount.zfs zroot/ROOT/debian-11 /root/
Message: filesystem 'zroot/ROOT/debian-11' cannot be mounted using 'mount'.
Use 'zfs set mountpoint=legacy' or 'zfs mount zroot/ROOT/debian-11'.
See zfs(8) for more information.
Error: 1

Failed to mount zroot/ROOT/debian-11 on /root/.
Manually mount the filesystem and exit.

The problem appears to be that the result of the condition is the same for legacy, none, and -, but they behave differently.

zfs/contrib/initramfs/scripts/zfs

Line 338 in 973934b

[ "$mountpoint1" = "none" ] ||

zfs/contrib/initramfs/scripts/zfs

Line 346 in 973934b

ZFS_CMD="mount.zfs"

I have no real problem with it (I'm using legacy and that works just fine), but I think you should be aware of this behavior.

[ghost]

@fandauchytil could you try this and let me know if it fixes that for you: #14455

[fandauchytil]

@freqlabs It works perfectly! Boot with the mointpoint=none property set now functions without any issues. Thank you :).