rei-forks/zfs-installer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Generalize fix filesystem mount ordering

Browse Source 
Previously, it wasn't taken into account that the root FS may not be `$v_rpool_name/ROOT`.
This commit is contained in:
Saverio Miroddi 2021-06-06 11:57:57 +02:00
parent 1293d4df5a
commit 9b634dde32
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install-zfs.sh
View File

@ -1450,10 +1450,15 @@ function fix_filesystem_mount_ordering {
local success= local success=
if [[ ! -s $c_zfs_mount_dir/etc/zfs/zfs-list.cache/$c_bpool_name || ! -s $c_zfs_mount_dir/etc/zfs/zfs-list.cache/$v_rpool_name ]]; then if [[ ! -s $c_zfs_mount_dir/etc/zfs/zfs-list.cache/$c_bpool_name || ! -s $c_zfs_mount_dir/etc/zfs/zfs-list.cache/$v_rpool_name ]]; then
local zfs_root_fs zfs_boot_fs
zfs_root_fs=$(chroot_execute 'zfs list / | awk "NR==2 {print \$1}"')
zfs_boot_fs=$(chroot_execute 'zfs list /boot | awk "NR==2 {print \$1}"')
# For the rpool only, it takes around half second on a test VM. # For the rpool only, it takes around half second on a test VM.
# #
chroot_execute "zfs set canmount=on $c_bpool_name" chroot_execute "zfs set canmount=on $zfs_boot_fs"
chroot_execute "zfs set canmount=on $v_rpool_name/ROOT" chroot_execute "zfs set canmount=on $zfs_root_fs"
SECONDS=0 SECONDS=0