X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=8fc4cfbb00eb96f9c36a2f07ddca068fad1c8ad6;hp=6ab31dacadd5d8edb8d0754616d85d94ca48791f;hb=bfd6bbd3a188aac6871f8b5e1116a0979682d52b;hpb=632c94b8382717f1a06b350c971b8246abbbbe61

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 6ab31da..8fc4cfb 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -5,6 +5,9 @@
 # do not use this if a menu will be presented
 [ "$flag_menu" ] && exit 0
 
+# set these early so they are lowest priority.
+echo FAIBASE STANDARD DEBIAN
+
 
 # For multi-boot system.
 # We check that we aren't in a pxe boot environment.
@@ -17,22 +20,32 @@
 #
 # Each host defines following:
 # The base distro:
-# UBUNTU, DEBIAN
+# UBUNTU or nothing. DEBIAN is always defined as a base.
 #
 # The base disto version, only use so far is the basefile name if it exists.
 # Debian stable basefile gets built by faisetup and gets used otherwise.
 # With X suffix, means it has gone through the dirinstall process and has eXtra
 # things installed, to speed up installation.
-# STRETCH64, BUSTER64, XENIAL64, FLIDAS64, FLIDAS64BIG, ETIONA64, BIONIC64, FOCAL64
 #
-# The distro subvol name, we can add as many of these as we want:
-# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_XENIAL, VOL_FLIDAS,
-# VOL_ETIONA VOL_STRETCH_BOOTSTRAP.  Using VOL_STRETCH_BOOTSTRAP sets up
-# the install to act like a pxe rom if grub sets a specific var.
+# STRETCH64, BUSTER64, BULLSEYE64, BOOKWORM64
+# FLIDAS64, FLIDAS64BIG, ETIONA64, NABIA64
+# XENIAL64, BIONIC64, FOCAL64,
 #
-# The apt sources files we want, STRETCH_FREE, STRETCH_NONFREE,
-# BUSTER_FREE, BUSTER_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, STRETCH_LINODE.
+# The distro subvol name, we can add as many of these as we want:
+# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_BULLSEYE, VOL_BOOKWORM
+# VOL_FLIDAS, VOL_ETIONA, VOL_NABIA
+# VOL_XENIAL, VOL_BIONIC VOL_FOCAL
+# VOL_BUSTER_BOOTSTRAP.
+# Using VOL_BUSTER_BOOTSTRAP sets up the install to act like a pxe rom if
+# grub sets a specific var.
+#
+# The apt sources files we want,
+# STRETCH_FREE, STRETCH_NONFREE,
+# BUSTER_FREE, BUSTER_NONFREE,
+# BULLSEYE_FREE, BULLSEYE_NONFREE
+# BOOKWORM_FREE, BOOKWORM_NONFREE
+# TESTING_FREE, TESTING_NONFREE,
+# XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, NABIA, STRETCH_LINODE.
 #
 # It's all a little redundant in some cases, but it keeps things
 # simpler.
@@ -66,35 +79,6 @@
 #
 # LINODE: For running a vm on linode, especially one created with fai-cd.
 
-###### begin Template for 51-multi-boot ######
-#
-# It has reasonable combinations of above classes.
-# It's a noop until we replace _ with host names.
-
-#!/bin/bash
-if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
-  case $HOSTNAME in
-    # stretch based minimal recovery / bootstraping os:
-    _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_FREE ;;
-    # flidas
-    _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
-    # etiona
-    _) echo UBUNTU ETIONA64 VOL_ETIONA ETIONA ;;
-    # stretch
-    _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_FREE ;;
-    # buster
-    _) echo DEBIAN BUSTER64 VOL_BUSTER BUSTER_FREE ;;
-    # testing
-    _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_FREE ;;
-    # xenial
-    _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;;
-    # bionic
-    _) echo UBUNTU BIONIC64 VOL_BIONIC BIONIC ;;
-    # focal
-    _) echo UBUNTU FOCAL64 VOL_FOCAL FOCAL ;;
-  esac
-fi
-###### end Template for 51-multi-boot ######
 
 if [[ -e /a/bin/fai/fai-wrapper ]]; then
   source /a/bin/distro-functions/src/identify-distros
@@ -121,7 +105,6 @@ if [[ -e /a/bin/fai/fai-wrapper ]]; then
   esac
 fi
 
-echo FAIBASE STANDARD
 
 #echo "PARTITION_PROMPT"
 #echo REPARTITION
@@ -131,3 +114,42 @@ if grep ^52:54:00: /sys/class/net/eth0/address &>/dev/null; then
   # if our eth0 mac is in the kvm range, we are a vm.
   echo "VM"
 fi
+
+exit 0
+### Below here is a comment of code, exit above is so it does not get executed ###
+
+###### begin Template for 51-multi-boot ######
+#
+# It has reasonable combinations of above classes.
+# It's a noop until we replace _ with host names.
+
+#!/bin/bash
+if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
+  case $HOSTNAME in
+    # bullseye based minimal recovery / bootstraping os:
+    _) echo BULLSEYE64 VOL_BULLSEYE_BOOTSTRAP BULLSEYE_FREE ;;
+    # flidas
+    _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
+    # etiona
+    _) echo UBUNTU ETIONA64 VOL_ETIONA ETIONA ;;
+    # nabia
+    _) echo UBUNTU NABIA64 VOL_NABIA NABIA  ;;
+    # stretch
+    _) echo STRETCH64 VOL_STRETCH STRETCH_NONFREE ;;
+    # buster
+    _) echo BUSTER64 VOL_BUSTER BUSTER_NONFREE ;;
+    # bullseye
+    _) echo BULLSEYE64 VOL_BULLSEYE BULLSEYE_NONFREE ;;
+    # bookworm
+    _) echo BOOKWORM64 VOL_BOOKWORM BOOKWORM_NONFREE ;;
+    # testing
+    _) echo BOOKWORM64 VOL_TESTING TESTING_NONFREE ;;
+    # xenial
+    _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;;
+    # bionic
+    _) echo UBUNTU BIONIC64 VOL_BIONIC BIONIC ;;
+    # focal
+    _) echo UBUNTU FOCAL64 VOL_FOCAL FOCAL ;;
+  esac
+fi
+###### end Template for 51-multi-boot ######