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

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index c7091f0..6ab31da 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 
 # assign classes to hosts based on their hostname
 
@@ -23,7 +23,7 @@
 # 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
+# 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,
@@ -32,7 +32,7 @@
 #
 # The apt sources files we want, STRETCH_FREE, STRETCH_NONFREE,
 # BUSTER_FREE, BUSTER_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE, FLIDAS, ETIONA, STRETCH_LINODE.
+# XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, STRETCH_LINODE.
 #
 # It's all a little redundant in some cases, but it keeps things
 # simpler.
@@ -73,41 +73,52 @@
 
 #!/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 ;;
-    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 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 FAIBASE STANDARD
@@ -117,6 +128,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