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

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 8fc4cfb..600fd1a 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -8,6 +8,9 @@
 # set these early so they are lowest priority.
 echo FAIBASE STANDARD DEBIAN
 
+# note, this is where this file comes from:
+# cp /usr/share/keyrings/freesh-archive-keyring.gpg STANDARD.gpg
+
 
 # For multi-boot system.
 # We check that we aren't in a pxe boot environment.
@@ -28,24 +31,24 @@ echo FAIBASE STANDARD DEBIAN
 # things installed, to speed up installation.
 #
 # STRETCH64, BUSTER64, BULLSEYE64, BOOKWORM64
-# FLIDAS64, FLIDAS64BIG, ETIONA64, NABIA64
+# FLIDAS64, FLIDAS64BIG, ETIONA64, NABIA64, ARAMO64
 # 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_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_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, STRETCH_LINODE.
+# XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, NABIA, ARAMO.
 #
 # It's all a little redundant in some cases, but it keeps things
 # simpler.
@@ -63,22 +66,24 @@ echo FAIBASE STANDARD DEBIAN
 # 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.
 #
-# LINODE: For running a vm on linode, especially one created with fai-cd.
-
+# 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.
+#
+# 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
@@ -121,9 +126,13 @@ exit 0
 ###### begin Template for 51-multi-boot ######
 #
 # It has reasonable combinations of above classes.
-# It's a noop until we replace _ with host names.
+# 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:
@@ -133,7 +142,9 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
     # etiona
     _) echo UBUNTU ETIONA64 VOL_ETIONA ETIONA ;;
     # nabia
-    _) echo UBUNTU NABIA64 VOL_NABIA 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
@@ -150,6 +161,8 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
     _) 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 ######