From 1b08e82a978c8db76e1ebc67f3b4ae875ba27537 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 27 Apr 2022 00:12:00 -0400 Subject: [PATCH] more aramo/jammy updates --- fai/config/basefiles/mk-basefile | 9 +++++++-- fai/config/class/50-host-classes | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile index 39471d8..b81965f 100755 --- a/fai/config/basefiles/mk-basefile +++ b/fai/config/basefiles/mk-basefile @@ -42,11 +42,14 @@ EXCLUDE_BIONIC=udhcpc,dibbler-client,info EXCLUDE_ETIONA=udhcpc,dibbler-client,info EXCLUDE_FOCAL=udhcpc,dibbler-client,info EXCLUDE_NABIA=udhcpc,dibbler-client,info +EXCLUDE_JAMMY= +EXCLUDE_ARAMO= # here you can add packages, that are needed very early INCLUDE_DEBIAN= INCLUDE_ETIONA=ifupdown INCLUDE_NABIA=ifupdown +INCLUDE_ARAMO=ifupdown setarch() { @@ -231,6 +234,8 @@ prtdists() { ETIONA64 FOCAL64 NABIA64 + JAMMY64 + ARAMO64 SQUEEZE32 SQUEEZE64 WHEEZY32 WHEEZY64 JESSIE32 JESSIE64 @@ -316,9 +321,9 @@ case "$target" in SLC6_32) slc i386 6 ;; SLC6_64) slc amd64 6 ;; SLC7_64) slc amd64 7 ;; - BELENOS*|FLIDAS*|ETIONA*|NABIA*) + BELENOS*|FLIDAS*|ETIONA*|NABIA*|ARAMO*) debgeneric $target $MIRROR_TRISQUEL ;; - TRUSTY*|XENIAL*|BIONIC*|FOCAL*) + TRUSTY*|XENIAL*|BIONIC*|FOCAL*|JAMMY*) debgeneric $target $MIRROR_UBUNTU ;; SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*|BULLSEYE*|BOOKWORM*|TRIXIE*|SID*) debgeneric $target $MIRROR_DEBIAN $ARCH;; diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes index 0e16c0e..11559c1 100755 --- a/fai/config/class/50-host-classes +++ b/fai/config/class/50-host-classes @@ -128,7 +128,7 @@ 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 -- 2.30.2