misc small fixes

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

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 8c3140b5fd3c711aadb11914591c74b650af0e1e..79826c7da5fac44a1897320ec005c9e77c22daa0 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -160,15 +160,19 @@ for dev in ${devs[@]}; do
 done
 
 if [[ ! $DISTRO ]]; then
-    if ifclass STABLE; then
+    if ifclass STRETCH64; then
+        DISTRO=debiantesting
+    elif ifclass STABLE; then
         DISTRO=debianstable
+    elif ifclass XENIAL64; then
+        DISTRO=ubuntuxenial
     else
-        DISTRO=debiantesting
+        echo "PARTITIONER ERROR: no distro class/var set" >&2
+        exit 1
     fi
 fi
 
 
-
 case ${#boot_devs[@]} in
     # need double the space if we are raid 10, and then
     # might as well give some extra overhead.
@@ -339,18 +343,13 @@ $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.
+# I will avoid using uuid in the future.
 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'
-$first_root_crypt  /i  btrfs  noatime,subvol=i  0 0
-EOF
-fi
 
 swaps=()
 for dev in ${devs[@]}; do