diff options
| author | Rich Ercolani <[email protected]> | 2023-05-31 19:58:41 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-05-31 16:58:41 -0700 |
| commit | 2810dda80b8e1d629236b82c5bee6a4ef717e02e (patch) | |
| tree | 9a891a74f519aa2f8db16ede3118410defbccff9 /contrib/initramfs/scripts/zfs | |
| parent | 928c81f4dfa994aad9a9406dee695ed954d77371 (diff) | |
Revert "initramfs: use `mount.zfs` instead of `mount`"
This broke mounting of snapshots on / for users.
See https://github.com/openzfs/zfs/issues/9461#issuecomment-1376162949 for more context.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Rich Ercolani <[email protected]>
Closes #14908
Diffstat (limited to 'contrib/initramfs/scripts/zfs')
| -rw-r--r-- | contrib/initramfs/scripts/zfs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs index 7f977a30f..0a2bd2efd 100644 --- a/contrib/initramfs/scripts/zfs +++ b/contrib/initramfs/scripts/zfs @@ -344,7 +344,7 @@ mount_fs() # Need the _original_ datasets mountpoint! mountpoint=$(get_fs_value "$fs" mountpoint) - ZFS_CMD="mount.zfs -o zfsutil" + ZFS_CMD="mount -o zfsutil -t zfs" if [ "$mountpoint" = "legacy" ] || [ "$mountpoint" = "none" ]; then # Can't use the mountpoint property. Might be one of our # clones. Check the 'org.zol:mountpoint' property set in @@ -361,7 +361,7 @@ mount_fs() fi # Don't use mount.zfs -o zfsutils for legacy mountpoint if [ "$mountpoint" = "legacy" ]; then - ZFS_CMD="mount.zfs" + ZFS_CMD="mount -t zfs" fi # Last hail-mary: Hope 'rootmnt' is set! mountpoint="" @@ -944,7 +944,7 @@ mountroot() echo " not specified on the kernel command line." echo "" echo "Manually mount the root filesystem on $rootmnt and then exit." - echo "Hint: Try: mount.zfs -o zfsutil ${ZFS_RPOOL-rpool}/ROOT/system $rootmnt" + echo "Hint: Try: mount -o zfsutil -t zfs ${ZFS_RPOOL-rpool}/ROOT/system $rootmnt" shell fi |