Skip to content

Commit a5c469c

Browse files
ofthesun9behlendorf
authored andcommitted
Fix for mountpoint=legacy
We need to clear mountpoint only after checking it. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Richard Yao <[email protected]> Signed-off-by: ofthesun9 <[email protected]> Closes #14599 Closes #14604
1 parent 4b3133e commit a5c469c

File tree

1 file changed

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

1 file changed

+3
-2
lines changed

contrib/initramfs/scripts/zfs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,12 @@ mount_fs()
341341
# isn't the root fs.
342342
return 0
343343
fi
344-
# Last hail-mary: Hope 'rootmnt' is set!
345-
mountpoint=""
344+
# Don't use mount.zfs -o zfsutils for legacy mountpoint
346345
if [ "$mountpoint" = "legacy" ]; then
347346
ZFS_CMD="mount.zfs"
348347
fi
348+
# Last hail-mary: Hope 'rootmnt' is set!
349+
mountpoint=""
349350
else
350351
mountpoint="$mountpoint1"
351352
fi

0 commit comments

Comments
 (0)