various fixes for bullseye and new ssh key changes

[automated-distro-installer] / fai / config / class / 50-host-classes

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index c62229f50a9a062f90512cabad166db9773b674a..8fc4cfbb00eb96f9c36a2f07ddca068fad1c8ad6 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -79,41 +79,6 @@ echo FAIBASE STANDARD DEBIAN
 #
 # 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
-    # bookworm
-    _) echo BOOKWORM64 VOL_BOOKWORM_BOOTSTRAP BOOKWORM_FREE ;;
-    # bullseye based minimal recovery / bootstraping os:
-    _) echo BULLSEYE64 VOL_BULLSEYE_BOOTSTRAP BULLSEYE_FREE ;;
-    # buster
-    _) echo BUSTER64 VOL_BUSTER_BOOTSTRAP BUSTER_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_FREE ;;
-    # buster
-    _) echo BUSTER64 VOL_BUSTER BUSTER_FREE ;;
-    # testing
-    _) echo 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
@@ -149,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 ######