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 openzfs#14599 Closes openzfs#14604
oshogbo · Mar 15, 2023 · a5c469c · a5c469c
1 parent 4b3133e
commit a5c469c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs
@@ -341,11 +341,12 @@ mount_fs()
 				# isn't the root fs.
 				return 0
 			fi
-			# Last hail-mary: Hope 'rootmnt' is set!
-			mountpoint=""
+			# Don't use mount.zfs -o zfsutils for legacy mountpoint
 			if [ "$mountpoint" = "legacy" ]; then
 				ZFS_CMD="mount.zfs"
 			fi
+			# Last hail-mary: Hope 'rootmnt' is set!
+			mountpoint=""
 		else
 			mountpoint="$mountpoint1"
 		fi