Skip to content

Commit

Permalink
Investigate mountopts
Browse files Browse the repository at this point in the history
Signed-off-by: Umer Saleem <usaleem@ixsystems.com>
  • Loading branch information
usaleem-ix committed Jun 11, 2024
1 parent f58cd6c commit c7df77f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions cmd/mount_zfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;

verbose += 10;
printf("--> mount.zfs invoked\n");
printf(" number of args: %d\n", argc);
for (int i = 0; i < argc; ++i) {
printf(" arg %d: %s\n", i, argv[i]);
}

/* check that we only have two arguments */
if (argc != 2) {
if (argc == 0)
Expand Down
4 changes: 2 additions & 2 deletions contrib/initramfs/scripts/zfs
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ mount_fs()

# Need the _original_ datasets mountpoint!
mountpoint=$(get_fs_value "$fs" mountpoint)
ZFS_CMD="mount -o zfsutil -t zfs"
ZFS_CMD="mount.zfs -o zfsutil"
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
Expand All @@ -362,7 +362,7 @@ mount_fs()
fi
# Don't use mount.zfs -o zfsutils for legacy mountpoint
if [ "$mountpoint" = "legacy" ]; then
ZFS_CMD="mount -t zfs"
ZFS_CMD="mount.zfs"
fi
# Last hail-mary: Hope 'rootmnt' is set!
mountpoint=""
Expand Down

0 comments on commit c7df77f

Please sign in to comment.