X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=a59ff3b41fce2602c827f8b553033adc39423d0d;hb=79cd04733bf570db299ef09195c498a63f3f3fd5;hp=3767bd3569599476a88835345291ba61c0281886;hpb=0b8eb4a3e41e6fd69f5da44f733b887eb5ed9f33;p=automated-distro-installer

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 3767bd3..a59ff3b 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -1,10 +1,13 @@
-#!/bin/bash -l
+#!/bin/bash
 
 # assign classes to hosts based on their hostname
 
 # 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.
@@ -17,22 +20,32 @@
 #
 # Each host defines following:
 # The base distro:
-# UBUNTU, DEBIAN
+# 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, XENIAL64, FLIDAS64, FLIDAS64BIG
 #
-# The distro subvol name, we can add as many of these as we want:
-# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_XENIAL, VOL_FLIDAS,
-# VOL_STRETCH_BOOTSTRAP.  Using VOL_STRETCH_BOOTSTRAP sets up the
-# install to act like a pxe rom if grub sets a specific var.
+# STRETCH64, BUSTER64, BULLSEYE64, BOOKWORM64
+# FLIDAS64, FLIDAS64BIG, ETIONA64, NABIA64, ARAMO64
+# XENIAL64, BIONIC64, FOCAL64,
 #
-# The apt sources files we want, STRETCH_FREE, STRETCH_NONFREE,
-# BUSTER_FREE, BUSTER_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE, FLIDAS, STRETCH_LINODE.
+# 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_ARAMO
+# 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.
+#
+# The apt sources files we want,
+# STRETCH_FREE, STRETCH_NONFREE, STRETCH_LINODE
+# BUSTER_FREE, BUSTER_NONFREE,
+# BULLSEYE_FREE, BULLSEYE_NONFREE
+# BOOKWORM_FREE, BOOKWORM_NONFREE
+# TESTING_FREE, TESTING_NONFREE,
+# XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, NABIA, ARAMO.
 #
 # It's all a little redundant in some cases, but it keeps things
 # simpler.
@@ -50,73 +63,103 @@
 # 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.
+# LINODE: For running a vm on linode, especially one created with fai-cd.
 #
-# PARTITION_PROMPT: If we don't see partitions to reuuse, prompt
-# to make sure we really want to repartition and use a completely
-# fresh install. I use this in case our repartition check has
-# a bug in it, or I accidentally set REPARTITION.
+# IANK / FSF: general setup of my machine vs FSF machines
+# NABIA_EXTRA: extra repos for NABIA from other distros
+# ARAMO_EXTRA: extra repos for ARAMO from other distros
 #
-# ROTATIONAL: in a system with ssd and hdd, install to the hdd
-# instead of the default ssd.
+# UBUNTU_UP: for trisquel, we want to inherit ubuntu things, except for
+# some ubuntu things which go in this class. UP = upstream.
 #
-# RAID0: Use raid 0 even if there are >= 4 disks with boot partititions.
+# D16: for kgpe-d16 specific settings.
 #
+# JAMMY_FIRMWARE: for trisquel install to get nonfree firmware from
+# ubuntu jammy.  The linux-firmware-free package in trisquel conflicts
+# with the linux-firmware package in ubuntu, but you only find out after
+# installing due to an error.
 #
-
-###### 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
-        # stretch based minimal recovery / bootstraping os:
-        _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_FREE ;;
-        # flidas
-        _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
-        # 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
-fi
-###### end Template for 51-multi-boot ######
+# For filesystem/partitioning related classes, see comments at the top of
+# fai/config/hooks/partition.DEFAULT
 
 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
-    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 "STANDARD"
 
 #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.
+# We must first replace _ with host name(s).
+
+#!/bin/bash
+
+# pick one of these:
+#echo IANK
+#echo FSF
+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 NABIA_EXTRA  ;;
+    # aramo
+    _) echo UBUNTU ARAMO64 VOL_ARAMO ARAMO ARAMO_EXTRA  ;;
+    # 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 ;;
+    # jammy
+    _) echo UBUNTU JAMMY64 VOL_JAMMY JAMMY ;;
+  esac
+fi
+###### end Template for 51-multi-boot ######