From ffbf3d9d64f9846be1151da6dd8a13f471795e55 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Tue, 26 Apr 2022 22:35:31 -0400 Subject: [PATCH] add jammy aramo --- fai/config/class/50-host-classes | 4 ++++ .../etc/apt/sources.list.d/jammy.list/{NABIA => NABIA_EXTRA} | 0 fai/config/hooks/partition.DEFAULT | 4 ++++ fai/config/scripts/LAST/50-misc | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) rename fai/config/files/etc/apt/sources.list.d/jammy.list/{NABIA => NABIA_EXTRA} (100%) diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes index 7de2287..0e16c0e 100755 --- a/fai/config/class/50-host-classes +++ b/fai/config/class/50-host-classes @@ -143,6 +143,8 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then _) 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 @@ -159,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 ###### diff --git a/fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA b/fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA_EXTRA similarity index 100% rename from fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA rename to fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA_EXTRA diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index d702351..1b80784 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -470,12 +470,16 @@ if [[ ! $DISTRO ]]; then DISTRO=ubuntubionic elif ifclass VOL_FOCAL; then DISTRO=ubuntufocal + elif ifclass VOL_JAMMY; then + DISTRO=ubuntujammy elif ifclass VOL_FLIDAS; then DISTRO=trisquelflidas elif ifclass VOL_ETIONA; then DISTRO=trisqueletiona elif ifclass VOL_NABIA; then DISTRO=trisquelnabia + elif ifclass VOL_ARAMO; then + DISTRO=trisquelaramo elif $mkroot2 || $mkroot2tab; then : else diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc index 687700a..16e697e 100755 --- a/fai/config/scripts/LAST/50-misc +++ b/fai/config/scripts/LAST/50-misc @@ -74,7 +74,7 @@ setrel() { return fi - dists="jessie stretch buster bullseye bookworm trixie focal bionic xenial trusty" + dists="jessie stretch buster bullseye bookworm trixie jammy focal bionic xenial trusty aramo nabia etiona" for d in $dists; do if grep -iq $d $target/etc/os-release; then release=$d -- 2.30.2