iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bad merge of upstream config
[automated-distro-installer]
/
faiserver-setup
diff --git
a/faiserver-setup
b/faiserver-setup
index 666774b7e8dff42dc32bc0341ec9b303db2e51b7..168dcda6d0518e09652ebfbb0c59fbbfcc4bd56d 100755
(executable)
--- a/
faiserver-setup
+++ b/
faiserver-setup
@@
-31,7
+31,7
@@
work. Separate from running this, faiserver needs to be setup in dns to
point to whatever host this is run on.
Default BASE_CODENAME is bookworm. Default ARCH is 64. The script expects corresponding
point to whatever host this is run on.
Default BASE_CODENAME is bookworm. Default ARCH is 64. The script expects corresponding
-$BASEFILE_DIR/${UPCASED_BASE_CODENAME}${ARCH}.tar.(
gz
|xz) to exist, and it must have been
+$BASEFILE_DIR/${UPCASED_BASE_CODENAME}${ARCH}.tar.(
zst
|xz) to exist, and it must have been
generated around the same time as the nfsroot, at least so it has the
same kernel version.
generated around the same time as the nfsroot, at least so it has the
same kernel version.
@@
-73,7
+73,7
@@
if [[ $base == [[:upper:]] ]]; then
exit 1
fi
exit 1
fi
-basefile=($BASEFILE_DIR/${base^^}${arch^^}.tar.
gz
)
+basefile=($BASEFILE_DIR/${base^^}${arch^^}.tar.
zst
)
sed="sed -ri --follow-symlinks"
if [[ ! -e $basefile ]]; then
sed="sed -ri --follow-symlinks"
if [[ ! -e $basefile ]]; then
@@
-97,7
+97,7
@@
armhf() {
# fai on ubuntu only has official support using the universe repo, but newer
# tends to have less bugs.
# fai on ubuntu only has official support using the universe repo, but newer
# tends to have less bugs.
-wget -O - https://fai-project.org/download/
2BF8D9FE074BCDE4.asc | apt-key add -
+wget -O - https://fai-project.org/download/
fai-project.gpg | sudo dd of=/etc/apt/trusted.gpg.d/fai-project.gpg
update=false
case $base in
update=false
case $base in