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

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 6f2e407..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,6 +79,45 @@
 #
 # LINODE: For running a vm on linode, especially one created with fai-cd.
 
+
+if [[ -e /a/bin/fai/fai-wrapper ]]; then
+  source /a/bin/distro-functions/src/identify-distros
+  if isdeb; then
+    codename=$(debian-codename)
+    echo ${codename^^}
+    distro=$(distro-name)
+    case $distro in
+      debian)
+        echo ${distro^^}
+        # nonfree repo is not going away any time soon due to
+        # gcc-doc being in nonfree
+        echo ${codename^^}_NONFREE
+        ;;
+      trisquel)
+        # easier to stay with fai example config if we just call it ubuntu
+        echo UBUNTU
+        ;;
+    esac
+  fi
+  case $HOSTNAME in
+    li|lj) echo "LINODE" ;;
+    bk|je) echo "NOCRYPT" ;;
+  esac
+fi
+
+
+#echo "PARTITION_PROMPT"
+#echo REPARTITION
+
+
+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.
@@ -74,18 +126,24 @@
 #!/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 ;;
+    # 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 DEBIAN STRETCH64 VOL_STRETCH STRETCH_FREE ;;
+    _) echo STRETCH64 VOL_STRETCH STRETCH_NONFREE ;;
     # buster
-    _) echo DEBIAN BUSTER64 VOL_BUSTER BUSTER_FREE ;;
+    _) echo BUSTER64 VOL_BUSTER BUSTER_NONFREE ;;
+    # bullseye
+    _) echo BULLSEYE64 VOL_BULLSEYE BULLSEYE_NONFREE ;;
+    # bookworm
+    _) echo BOOKWORM64 VOL_BOOKWORM BOOKWORM_NONFREE ;;
     # testing
-    _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_FREE ;;
+    _) echo BOOKWORM64 VOL_TESTING TESTING_NONFREE ;;
     # xenial
     _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;;
     # bionic
@@ -95,30 +153,3 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
   esac
 fi
 ###### end Template for 51-multi-boot ######
-
-if [[ -e /a/bin/fai/fai-wrapper ]]; then
-  source /a/bin/distro-functions/src/identify-distros
-  if isdebian; then
-    echo "DEBIAN"
-    tmp=$(debian-codename)
-    echo ${tmp^^}
-    # nonfree repo is not going away any time soon due to
-    # gcc-doc being in nonfree
-    echo ${tmp^^}_NONFREE
-  fi
-  case $HOSTNAME in
-    li|lj) echo "LINODE" ;;
-    bk) echo "NOCRYPT" ;;
-  esac
-fi
-
-echo FAIBASE STANDARD
-
-#echo "PARTITION_PROMPT"
-#echo REPARTITION
-
-
-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