fix lid close, other improvements

[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 0e16c0e98ebf82281aaa8093d04657210c394978..a59ff3b41fce2602c827f8b553033adc39423d0d 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -28,24 +28,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,29 +63,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.
-#
-# REROOTFS: Don't reuse the root filesystem, even if we normally would
+# LINODE: For running a vm on linode, especially one created with fai-cd.
 #
-# NOWIPE: use existing subvolumes if they exist
+# 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
 #
-# 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.
+# UBUNTU_UP: for trisquel, we want to inherit ubuntu things, except for
+# some ubuntu things which go in this class. UP = upstream.
 #
-# ROTATIONAL: in a system with ssd and hdd, install to the hdd
-# instead of the default ssd.
+# D16: for kgpe-d16 specific settings.
 #
-# RAID0: Use raid 0 even if there are >= 4 disks with boot partitions.
+# 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.
 #
-# LINODE: For running a vm on linode, especially one created with fai-cd.
-#
-# IANK / FSF: general setup of my machine vs FSF machines
-# NABIA_EXTRA: extra repos for NABIA from other distros
-
+# 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
@@ -128,11 +123,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
 
-echo IANK
+# 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: