add xenial support with basic debian parity

[automated-distro-installer] / fai / config / hooks / partition.DEFAULT

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 9a8c8363f48defc58293384b7e5c4e552fc35cd8..8c3140b5fd3c711aadb11914591c74b650af0e1e 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -339,15 +339,16 @@ $first_boot_dev  /boot  btrfs  noatime,subvol=boot_$DISTRO  0 0
 EOF
 
 
+# these 2 are alternative ways to identify a subvol, i think i prefer the 2nd.
 if ifclass treetowl; then
     cat >> /tmp/fai/fstab <<'EOF'
+$first_root_crypt  /i  btrfs  noatime,subvol=i  0 0
 UUID=3f7b31cd-f299-40b4-a86b-7604282e2715 /i btrfs  noatime  0 2
 EOF
 fi
-
 if ifclass frodo; then
     cat >> /tmp/fai/fstab <<'EOF'
-/q/i  /i  none  bind  0 0
+$first_root_crypt  /i  btrfs  noatime,subvol=i  0 0
 EOF
 fi