remove superflous mount option. I never set a default mount subvol.

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 9cbebfe5260f9dd57f8c6429fadc8a3649afd08f..ebe24b89fc0ad63ad726cf92251907ce5e58b509 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -388,7 +388,7 @@ EOF
 crypt-$vg-data /dev/$vg/data  /q/root/luks/iank  nofail,discard,luks
 EOF
     cat >/tmp/fai/fstab <<EOF
-/dev/mapper/crypt-$vg-data   /mnt/dataTBD  btrfs    nofail,$fstabstd,noatime,subvolid=0$mopts  0 0
+/dev/mapper/crypt-$vg-data   /mnt/dataTBD  btrfs    nofail,$fstabstd,noatime$mopts  0 0
 EOF
     return 0
   fi
@@ -396,14 +396,14 @@ EOF
   # note, fai creates the mountpoints listed here
   cat > /tmp/fai/fstab <<EOF
 $first_root_dev  /  btrfs                   $fstabstd,noatime,subvol=root_$DISTRO$mopts  0 0
-$first_root_dev  /mnt/root  btrfs    nofail,$fstabstd,noatime,subvolid=0$mopts  0 0
+$first_root_dev  /mnt/root  btrfs    nofail,$fstabstd,noatime$mopts  0 0
 $first_boot_dev  /boot  btrfs        nofail,$fstabstd,noatime,subvol=$boot_vol  0 0
 $first_efi  /boot/efi  vfat          nofail,$fstabstd  0 0
-$first_boot_dev  /mnt/boot  btrfs    nofail,$fstabstd,noatime,subvolid=0  0 0
+$first_boot_dev  /mnt/boot  btrfs    nofail,$fstabstd,noatime  0 0
 EOF
   if ! fsf && ! $skip_o; then
     cat >> /tmp/fai/fstab <<EOF
-/dev/mapper/crypt-${vgs[0]}-o  /mnt/o  btrfs       nofail,$fstabstd,noatime,subvolid=0$mopts_o  0 0
+/dev/mapper/crypt-${vgs[0]}-o  /mnt/o  btrfs       nofail,$fstabstd,noatime$mopts_o  0 0
 EOF
   fi
   rm -f /tmp/fai/crypttab
@@ -465,7 +465,7 @@ EOF
   # EOF
   #       done
   #       cat >> /tmp/fai/fstab <<EOF
-  # /dev/mapper/crypt_dev_${big_disks[0]}  /mnt/i  btrfs  nofail,$fstabstd,noatime,subvolid=0  0 0
+  # /dev/mapper/crypt_dev_${big_disks[0]}  /mnt/i  btrfs  nofail,$fstabstd,noatime  0 0
   # EOF
   #     fi
   # helpful for manually running later if these disks move hosts
@@ -479,9 +479,9 @@ crypt_dev_ata-ST6000DM001-1XY17Z_Z4D29EBL-part1 /dev/disk/by-id/ata-ST6000DM001-
 EOF
     cat >> $target_etc/fstab <<EOF
 # r7 = root partition7. it isnt actually #7 anymore, not a great name, but whatever
-/dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V${even_bigsuf}  /mnt/r7  btrfs  nofail,$fstabstd,noatime,compress=zstd,subvolid=0  0 0
-/dev/mapper/crypt_dev_ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1  /mnt/rust1  btrfs  nofail,$fstabstd,noatime,compress=zstd,subvolid=0  0 0
-/dev/mapper/crypt_dev_ata-ST6000DM001-1XY17Z_Z4D29EBL-part1  /mnt/rust2  btrfs  nofail,$fstabstd,noatime,compress=zstd,subvolid=0  0 0
+/dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V${even_bigsuf}  /mnt/r7  btrfs  nofail,$fstabstd,noatime,compress=zstd  0 0
+/dev/mapper/crypt_dev_ata-TOSHIBA_MD04ACA500_84R2K773FS9A-part1  /mnt/rust1  btrfs  nofail,$fstabstd,noatime,compress=zstd  0 0
+/dev/mapper/crypt_dev_ata-ST6000DM001-1XY17Z_Z4D29EBL-part1  /mnt/rust2  btrfs  nofail,$fstabstd,noatime,compress=zstd  0 0
 EOF
   fi
 }
@@ -524,8 +524,8 @@ EOF
   fi
   mkdir -p /mnt/root2 /mnt/boot2
   cat >>/mnt/root/root2-fstab <<EOF
-${root2_devs[0]} /mnt/root2  btrfs  nofail,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s,noatime,subvolid=0$mopts  0 0
-${boot2_devs[0]} /mnt/boot2  btrfs  nofail,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s,noatime,subvolid=0  0 0
+${root2_devs[0]} /mnt/root2  btrfs  nofail,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s,noatime$mopts  0 0
+${boot2_devs[0]} /mnt/boot2  btrfs  nofail,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s,noatime  0 0
 EOF
   exit 0
 }
@@ -1286,7 +1286,7 @@ fi
 
 if $wipe && [[ $DISTRO != *_bootstrap ]]; then
   # bootstrap distro doesn't use separate encrypted root.
-  mount -o subvolid=0 ${root_devs[0]} /mnt
+  mount ${root_devs[0]} /mnt
   # systemd creates subvolumes we want to delete.
   mapfile -t s < <(btrfs subvolume list --sort=-path /mnt |
                      sed -rn "s#^.*path\s*(root_$DISTRO/\S+)\s*\$#\1#p")
@@ -1316,11 +1316,11 @@ if $wipe && [[ $DISTRO != *_bootstrap ]]; then
   umount /mnt
 fi
 
-mount -o subvolid=0 $first_boot_dev /mnt
+mount $first_boot_dev /mnt
 cd /mnt
 btrfs subvolume set-default 0 /mnt # already default, just ensuring it.
 
-# for libreboot systems. grub2 only reads from subvolid=0
+# for libreboot systems. grub2 only reads from the root subvol.
 mkdir -p /mnt/grub2
 
 cp $FAI/distro-install-common/libreboot_grub.cfg /mnt/grub2

diff --git a/install-chboot b/install-chboot
index 041302df3904e109b8b669dfb113551904eb1fda..7ec969476ad318a3daab110f8b63ed23b25c22e3 100755 (executable)
--- a/install-chboot
+++ b/install-chboot
@@ -39,7 +39,7 @@ e() { echo "$@"; "$@"; }
 
 boot_dev=$(mount | sed -rn "s#^(\S+) on /boot .*#\1#p")
 mount_point=$(mktemp -d)
-e mount -o subvolid=0 $boot_dev $mount_point
+e mount $boot_dev $mount_point
 
 shopt -s nullglob
 for dir in "$mount_point"/*; do