various fixes and initial focal support

[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 ef0c7815477961582cc7ad29f31d870916c461c1..9f4f8a6b85142eef2d23e6236659dbbd52e8fcf4 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -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.
@@ -88,6 +88,10 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
         _) 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 ######