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

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 465a64f..8fc4cfb 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -1,22 +1,13 @@
-#!/bin/bash -l
+#!/bin/bash
 
 # assign classes to hosts based on their hostname
 
-# NOTE:
-# 51-multi-boot should have something like this
-# for transient host configs which are not saved in
-# git (and make it executable):
-
-# if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
-#     case $HOSTNAME in
-#     frodo) echo STABLE ;;
-#     esac
-# fi
-
-
 # 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.
@@ -24,30 +15,54 @@
 # We check the reverse condition in 51-multi-boot,
 # and set what os we are installing, but don't check it
 # into git since it changes regularly.
-# It's code looks like this:
-# if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
-#     case $HOSTNAME in
-#         tp) DEBIAN STABLE VOL_STABLE STABLE_FREE;;
-#         # add more multi-boot hostnames here
-#     esac
-# fi
-#
-# Each host defines the base distro: UBUNTU or DEBIAN.
-# the disto version, also the basefile name if we aren't installing debian stable:
-# STABLE, STRETCH64, XENIAL64, BELENOS64, FLIDAS64
-# the distro subvol name, we can add as many of these as we want:
-# VOL_STABLE, VOL_STABLE_BOOTSTRAP, VOL_STRETCH, VOL_XENIAL, VOL_BELENOS, VOL_FLIDAS
-# Using VOL_STABLE_BOOTSTRAP sets up the install to act like a pxe rom if
+
+#
+#
+# Each host defines following:
+# The base distro:
+# 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, BULLSEYE64, BOOKWORM64
+# FLIDAS64, FLIDAS64BIG, ETIONA64, NABIA64
+# XENIAL64, BIONIC64, FOCAL64,
+#
+# 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.
-# and the class which defines the apt sources files we want,
-# STABLE_FREE, STABLE_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE (no XENIAL_NONFREE setup yet), BELENOS, FLIDAS, STABLE_LINODE.
-# This is a little redundant in some cases, but it keeps things
+#
+# 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.
 #
 #
 # Other notable classes:
 #
+# INSTALL: for autodiscover iso, this is needed. We could also add it to
+# the autodiscover grub, but then we have to burn a new iso if we want a
+# non-install one. It sets the class for the corresponding INSTALL.var,
+# which sets FAI_ACTION=INSTALL. I'm not sure if this variable overrides
+# FAI_ACTION outside of autodiscover, todo: test it out, if it doesn't,
+# make install be default in 51-multi-boot, and disable it if needed.
+#
+# DESKTOP: install a bunch of extra packages. For creating X suffix
+# basefiles. See README.
+#
 # REPARTITION: we try to reuse partitions/filesystems to install a new
 # os into a multi-os system, if we see some basic hueristics, like the
 # right amount of them. This overrides that.
@@ -62,34 +77,79 @@
 #
 # RAID0: Use raid 0 even if there are >= 4 disks with boot partititions.
 #
-#
+# 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 isdebian; then
-        echo "DEBIAN"
-    fi
-    if isdebian-stable; then
-        echo "STABLE"
-        case $HOSTNAME in
-            li|lj) echo "STABLE_LINODE" ;;
-            *)
-                # nonfree repo is not going away any time soon due to
-                # gcc-doc being in nonfree
-                echo "STABLE_NONFREE"
-                ;;
-        esac
-    elif isdebian-testing; then
-        echo "TESTING_NONFREE"
-    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"
 
-echo "PARTITION_PROMPT"
+#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"
+  # 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 ######