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 4003a2466207c5fc458b71067cefa70242abb110..168dcda6d0518e09652ebfbb0c59fbbfcc4bd56d 100755
(executable)
--- a/
faiserver-setup
+++ b/
faiserver-setup
@@
-30,8
+30,8
@@
as the tftp server. I vaguely remember that using a hostname does not
work. Separate from running this, faiserver needs to be setup in dns to
point to whatever host this is run on.
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 b
ullseye
. Default ARCH is 64. The script expects corresponding
-$BASEFILE_DIR/${UPCASED_BASE_CODENAME}${ARCH}.tar.(
gz
|xz) to exist, and it must have been
+Default BASE_CODENAME is b
ookworm
. Default ARCH is 64. The script expects corresponding
+$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.
@@
-65,7
+65,7
@@
esac
e() { echo "+ $@"; "$@"; }
e() { echo "+ $@"; "$@"; }
-base=${1:-b
ullseye
}
+base=${1:-b
ookworm
}
arch=${2:-64}
if [[ $base == [[:upper:]] ]]; then
arch=${2:-64}
if [[ $base == [[:upper:]] ]]; then
@@
-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,11
+97,11
@@
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
- stretch|buster|bullseye)
+ stretch|buster|bullseye
|bookworm
)
if ! grep -qFx "deb https://fai-project.org/download $base koeln" /etc/apt/sources.list.d/fai.list; then
update=true
fi
if ! grep -qFx "deb https://fai-project.org/download $base koeln" /etc/apt/sources.list.d/fai.list; then
update=true
fi
@@
-294,6
+294,12
@@
else # not armhf
e fai-setup -evf -B $basefile
# fai-setup expert mode avoids writing to /var/log/fai/variables
# at least config_src is needed for autodiscover
e fai-setup -evf -B $basefile
# fai-setup expert mode avoids writing to /var/log/fai/variables
# at least config_src is needed for autodiscover
+
+
+ # lld /var/log/fai/remote-logs:
+ # d 750 fai nogroup 100 08-07 08:51 pm /var/log/fai/remote-logs
+ # We could change the group or something, but why not just give me more permissions :)
+ e usermod -a -G nogroup iank
$sed '/^FAI_CONFIGDIR|^FAI_CONFIG_SRC|^LOGUSER/d' /var/log/fai/variables
tee -a /var/log/fai/variables <<'EOF'
LOGUSER=fai
$sed '/^FAI_CONFIGDIR|^FAI_CONFIG_SRC|^LOGUSER/d' /var/log/fai/variables
tee -a /var/log/fai/variables <<'EOF'
LOGUSER=fai