Skip to content

Commit b7ef914

Browse files
szuberskandrewc12
authored andcommitted
initramfs: use mount.zfs instead of mount
A followup to d7a6740 For `mount -t zfs -o opts ds mp` command line some implementations of `mount(8)`, e. g. Busybox in Debian work as follows: ``` newfstatat(AT_FDCWD, "ds", 0x7fff826f4ab0, 0) = -1 mount("ds", "mp", "zfs", MS_SILENT, NULL) = 0 ``` The logic above skips completely `mount.zfs` and prevents us from reading filesystem properties and applying mount options. For comparison, the coreutils `mount(8)` implementation does: ``` openat(AT_FDCWD, "/proc/filesystems", O_RDONLY|O_CLOEXEC) = 3 // figure out that zfs is a `nodev` filesystem and look for a helper newfstatat(AT_FDCWD, "/sbin/mount.zfs" ...) = 0 execve("/sbin/mount.zfs" ...) = 0 ``` Using `mount.zfs` in initramfs would help circumvent deficiencies of some of `mount(8)` implementations. `mount -t zfs` translates to `mount.zfs` invocation, except for cases when explicitly disabled by `-i`. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: szubersk <[email protected]> Closes openzfs#13305
1 parent cac0be5 commit b7ef914

File tree

1 file changed

+3
-3
lines changed
  • contrib/initramfs/scripts

1 file changed

+3
-3
lines changed

contrib/initramfs/scripts/zfs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ mount_fs()
328328

329329
# Need the _original_ datasets mountpoint!
330330
mountpoint=$(get_fs_value "$fs" mountpoint)
331-
ZFS_CMD="mount -o zfsutil -t zfs"
331+
ZFS_CMD="mount.zfs -o zfsutil"
332332
if [ "$mountpoint" = "legacy" ] || [ "$mountpoint" = "none" ]; then
333333
# Can't use the mountpoint property. Might be one of our
334334
# clones. Check the 'org.zol:mountpoint' property set in
@@ -351,7 +351,7 @@ mount_fs()
351351
# If it's not a legacy filesystem, it can only be a
352352
# native one...
353353
if [ "$mountpoint" = "legacy" ]; then
354-
ZFS_CMD="mount -t zfs"
354+
ZFS_CMD="mount.zfs"
355355
fi
356356
fi
357357

@@ -919,7 +919,7 @@ mountroot()
919919
echo " not specified on the kernel command line."
920920
echo ""
921921
echo "Manually mount the root filesystem on $rootmnt and then exit."
922-
echo "Hint: Try: mount -o zfsutil -t zfs ${ZFS_RPOOL-rpool}/ROOT/system $rootmnt"
922+
echo "Hint: Try: mount.zfs -o zfsutil ${ZFS_RPOOL-rpool}/ROOT/system $rootmnt"
923923
shell
924924
fi
925925

0 commit comments

Comments
 (0)