aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-09-04 14:41:44 +0200
committerMike Gabriel <sunweaver@debian.org>2023-09-07 18:45:35 +0000
commit889a6ce98b2710e60d775fd72bed24f60fed366f (patch)
treec8dd6b973aa56c1634a0af087c5a068689250afb
parentc1f2924f5d350365b2cc5afc17da4130761ac890 (diff)
downloaddebian-edu-fai+itzks-889a6ce98b2710e60d775fd72bed24f60fed366f.tar.gz
debian-edu-fai+itzks-889a6ce98b2710e60d775fd72bed24f60fed366f.tar.bz2
debian-edu-fai+itzks-889a6ce98b2710e60d775fd72bed24f60fed366f.zip
bin/debian-edu-faiinstall: Echo headlines to show where we are in the script
-rwxr-xr-xbin/debian-edu-faiinstall34
1 files changed, 33 insertions, 1 deletions
diff --git a/bin/debian-edu-faiinstall b/bin/debian-edu-faiinstall
index 7d51a0e..2763280 100755
--- a/bin/debian-edu-faiinstall
+++ b/bin/debian-edu-faiinstall
@@ -2,7 +2,7 @@
#
# Prepare for FAI installation of Debian Edu.
-set -ex
+set -x
LC_ALL=C
export LC_ALL
@@ -132,6 +132,16 @@ for codename in ${codenames}; do
# iterate over configured FAI client architectures...
for arch in ${archs}; do
+ set +x
+
+ echo
+ echo "###"
+ echo "### Creating/updating FAI server configuration"
+ echo "### (codename: ${codename}, architecture: ${arch})"
+ echo "###"
+
+ set -x
+
# create codename based fai base config
faiconfig="/etc/debian-edu/fai/debian-edu-fai.${arch}+${codename}"
if [ -d /etc/debian-edu/fai/debian-edu-fai.TEMPLATE ]; then
@@ -213,6 +223,17 @@ for codename in ${codenames}; do
# This is a known issue and works as designed. People might have chosen to
# use difference FAI_CONFIGDIR values for different environments and with
# such a choice executing the below per arch and per codename makes sense.
+
+ set +x
+
+ echo
+ echo "###"
+ echo "### Tweaking FAI config space"
+ echo "### (codename: ${codename}, architecture: ${arch})"
+ echo "###"
+
+ set -x
+
find ${FAI_CONFIGDIR_REAL} -name '*.in' | while read file_to_adapt; do
cp ${file_to_adapt} ${file_to_adapt%.in}
@@ -239,6 +260,14 @@ for codename in ${codenames}; do
export http_proxy
fi
+ set +x
+
+ echo
+ echo "###"
+ echo "### Creating FAI nfsroot installer environment"
+ echo "### (codename: ${codename}, architecture: ${arch})"
+ echo "###"
+
# the NFSROOT variable we should have obtained from sourcing $faiconfig/nfsroot.conf
# (aka /etc/fai/nfsroot.conf) above...
if [ -n "${NFSROOT}" ] && [ -n "${codename}" ]; then
@@ -303,6 +332,9 @@ kernel /debian-edu-fai/${arch}+${codename}/vmlinuz initrd=initrd.img \${params}
initrd /debian-edu-fai/${arch}+${codename}/initrd.img
boot || goto failed
EOF
+
+ set -x
+
done
done