bunch of minor updates

[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 9f4f8a6b85142eef2d23e6236659dbbd52e8fcf4..6f2e407979c754706c1eecbcd2b6facccdb463f6 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -73,45 +73,43 @@
 
 #!/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
+  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
-    if isdebian; then
-        echo "DEBIAN"
-    fi
-    if isdebian-stable; then
-        echo "STRETCH"
-        case $HOSTNAME in
-            li|lj) echo "STRETCH_LINODE" ;;
-            *)
-                # nonfree repo is not going away any time soon due to
-                # gcc-doc being in nonfree
-                echo "STRETCH_NONFREE"
-                ;;
-        esac
-    fi
+  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
@@ -121,6 +119,6 @@ echo FAIBASE STANDARD
 
 
 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"
+  # if our eth0 mac is in the kvm range, we are a vm.
+  echo "VM"
 fi