Provision: desktop-basic: fix hostname config

diff --git a/provision/desktop-basic b/provision/desktop-basic
index b25f186f345e9dff7164bbe56ea34186c22ed828..8181edfa1326b4da761eec0c13b656cb6f2987a2 100755 (executable)
--- a/provision/desktop-basic
+++ b/provision/desktop-basic
@@ -12,8 +12,13 @@ MIRROR="$3"
 APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 
 # Set hostname
-echo "$HOSTNAME.$DOMAIN"           | sudo tee    /etc/hostname > /dev/null
-echo "127.0.0.1 $HOSTNAME.$DOMAIN" | sudo tee -a /etc/hosts    > /dev/null
+echo "$HOSTNAME.$DOMAIN" | sudo tee /etc/hostname > /dev/null
+sudo hostname $HOSTNAME.$DOMAIN
+
+# Set hosts entry
+if ! grep -q "^127.0.0.1 $HOSTNAME.$DOMAIN $HOSTNAME$" /etc/hosts; then
+  echo "127.0.0.1 $HOSTNAME.$DOMAIN $HOSTNAME" | sudo tee -a /etc/hosts > /dev/null
+fi
 
 # Configure keyboard
 cat <<-EOF | sudo tee /etc/default/keyboard > /dev/null