c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-10-26 18:05:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for mountpoint=legacy

Browse Source 
We need to clear mountpoint only after checking it.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: ofthesun9 <olivier@ofthesun.net>
Closes #14599
Closes #14604
This commit is contained in:
ofthesun9 2023-03-15 00:40:55 +01:00 committed by Brian Behlendorf
parent 4b3133e671
commit a5c469c5f3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/initramfs/scripts/zfs
View File

@ -341,11 +341,12 @@ mount_fs()
# isn't the root fs. # isn't the root fs.
return 0 return 0
fi fi
# Last hail-mary: Hope 'rootmnt' is set! # Don't use mount.zfs -o zfsutils for legacy mountpoint
mountpoint=""
if [ "$mountpoint" = "legacy" ]; then if [ "$mountpoint" = "legacy" ]; then
ZFS_CMD="mount.zfs" ZFS_CMD="mount.zfs"
fi fi
# Last hail-mary: Hope 'rootmnt' is set!
mountpoint=""
else else
mountpoint="$mountpoint1" mountpoint="$mountpoint1"
fi fi