aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Berhoerster <guido+freiesoftware@berhoerster.name>2023-09-08 13:56:19 +0200
committerGuido Berhoerster <guido+freiesoftware@berhoerster.name>2023-09-08 13:56:19 +0200
commit4c9e66b1d36915f220f5812868a05cbcc31c9c1d (patch)
treee26750fa5bbc2b0f9a3b9c2e9da46b688ca2064d
parent92232827e23ed5dc7c35783cac3026299ccbf9d7 (diff)
downloaddebian-edu-fai+itzks-4c9e66b1d36915f220f5812868a05cbcc31c9c1d.tar.gz
debian-edu-fai+itzks-4c9e66b1d36915f220f5812868a05cbcc31c9c1d.tar.bz2
debian-edu-fai+itzks-4c9e66b1d36915f220f5812868a05cbcc31c9c1d.zip
Do not append the hostname to /etc/mailname
Do not append to /etc/mailname, the file should contain a single hostname. Rather create it with the default "postoffice.intern" if it does not exist yet. This is consistent with manual installations.
-rwxr-xr-xfai/config/scripts/DEBIAN/40-misc4
1 files changed, 3 insertions, 1 deletions
diff --git a/fai/config/scripts/DEBIAN/40-misc b/fai/config/scripts/DEBIAN/40-misc
index ea68373..12b5ec0 100755
--- a/fai/config/scripts/DEBIAN/40-misc
+++ b/fai/config/scripts/DEBIAN/40-misc
@@ -11,7 +11,9 @@ for module in $MODULESLIST; do
done
fcopy -Mv /etc/hostname || echo $HOSTNAME > $target/etc/hostname
-ainsl -a /etc/mailname ${HOSTNAME}
+if [ ! -e $target/etc/mailname ]; then
+ printf 'postoffice.intern\n' > $target/etc/mailname
+fi
if [ ! -e $target/etc/adjtime ]; then
printf "0.0 0 0.0\n0\nUTC\n" > $target/etc/adjtime
fi