iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4abbc67
)
add jammy aramo
author
Ian Kelling
<iank@fsf.org>
Wed, 27 Apr 2022 02:35:31 +0000
(22:35 -0400)
committer
Ian Kelling
<iank@fsf.org>
Wed, 27 Apr 2022 02:35:31 +0000
(22:35 -0400)
fai/config/class/50-host-classes
patch
|
blob
|
history
fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA_EXTRA
[moved from
fai/config/files/etc/apt/sources.list.d/jammy.list/NABIA
with 100% similarity]
patch
|
blob
|
history
fai/config/hooks/partition.DEFAULT
patch
|
blob
|
history
fai/config/scripts/LAST/50-misc
patch
|
blob
|
history
diff --git
a/fai/config/class/50-host-classes
b/fai/config/class/50-host-classes
index 7de22876d58d69ca8c5b7decfb73d0a50f6f85db..0e16c0e98ebf82281aaa8093d04657210c394978 100755
(executable)
--- 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 ;;
_) 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
# 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 ;;
_) 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 ######
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 d702351a38178de41b5ed2e6395af241ab9035dc..1b80784da925a4103e460d6b6ecc81f582e27138 100755
(executable)
--- 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
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_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
elif $mkroot2 || $mkroot2tab; then
:
else
diff --git
a/fai/config/scripts/LAST/50-misc
b/fai/config/scripts/LAST/50-misc
index 687700a6a5c112f79b5be81459456ba6eac24bdd..16e697e5eb1a5da5e41bdd8e8adbb4dd1cd24693 100755
(executable)
--- a/
fai/config/scripts/LAST/50-misc
+++ b/
fai/config/scripts/LAST/50-misc
@@
-74,7
+74,7
@@
setrel() {
return
fi
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
for d in $dists; do
if grep -iq $d $target/etc/os-release; then
release=$d