more aramo/jammy updates

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 39471d83ae7cbff6e8416731ba7066a2707b4d5d..b81965fc2a01697fea48d3b82ba9a76757b52833 100755 (executable)
--- 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_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
 
 # here you can add packages, that are needed very early
 INCLUDE_DEBIAN=
 INCLUDE_ETIONA=ifupdown
 INCLUDE_NABIA=ifupdown

+INCLUDE_ARAMO=ifupdown

 
 setarch() {
 
 
 setarch() {
 


@@ -231,6 +234,8 @@ prtdists() {
                  ETIONA64
                  FOCAL64
                  NABIA64
                  ETIONA64
                  FOCAL64
                  NABIA64

+                 JAMMY64
+                 ARAMO64

     SQUEEZE32    SQUEEZE64
     WHEEZY32     WHEEZY64
     JESSIE32     JESSIE64
     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 ;;
     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 ;;
         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;;
         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 0e16c0e98ebf82281aaa8093d04657210c394978..11559c1e9f9a9a7b8ac0926f866cd763dff1dd09 100755 (executable)
--- 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.
 ###### 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
 
 
 #!/bin/bash