X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=8a32c31b49cb81eb8c4953cea8b9cd1e247f4170;hb=d0b6a8cd4608fdffcf733f9180744819d8889be0;hp=39c0b3fa9ade884445c36fb0fddfa403a7bc0c4f;hpb=7fdea51613929853c4df86261150bd3782fb81b2;p=automated-distro-installer

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 39c0b3f..8a32c31 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -160,15 +160,21 @@ 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
+    elif ifclass BELENOS64; then
+        DISTRO=trisquelbelenos
     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,15 +345,11 @@ $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'
-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
+UUID=3f7b31cd-f299-40b4-a86b-7604282e2715 /i btrfs  noatime  0 2
 EOF
 fi