Set hostname at kvmx_up

3 files changed, 22 insertions, 18 deletions

diff --git a/kvmx b/kvmx
index 7c60af9..cb0e0a0 100755
--- a/kvmx
+++ b/kvmx
@@ -123,6 +123,28 @@ function kvmx_up {
   done
   echo " done."
 
+  echo "Setting hostname..."
+  $SSH_COMMAND -o ConnectTimeout=2 -p $SSH $SSH_LOGIN@127.0.0.1 <<EOF
+  ##### BEGIN REMOTE SCRIPT #####
+  OLD_HOST="\$(hostname)"
+
+  # 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
+
+  echo "$hostname.$domain" | sudo tee /etc/hostname > /dev/null
+  sudo hostname $hostname.$domain
+
+  # Remove old hostname from hosts file
+  if [ "\$OLD_HOST" != "$hostname.$domain" ]; then
+    if grep -q \$OLD_HOST /etc/hosts; then
+      sudo sed -i -e '|\$OLD_HOST|d' /etc/hosts
+    fi
+  fi
+  ##### END REMOTE SCRIPT #######
+EOF
+
   # Somehow it is starting before DBUS and then crashing, so we try to start again
   echo "Ensure spice-vdagent is running..."
   echo "sudo /usr/sbin/service spice-vdagent start" | kvmx_ssh
diff --git a/provision/desktop-basic b/provision/desktop-basic
index d711383..dd5531f 100755
--- a/provision/desktop-basic
+++ b/provision/desktop-basic
@@ -26,15 +26,6 @@ DOMAIN="$2"
 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
-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
 # KEYBOARD CONFIGURATION FILE
diff --git a/provision/development b/provision/development
index fa7a323..e14d0ac 100755
--- a/provision/development
+++ b/provision/development
@@ -26,15 +26,6 @@ DOMAIN="$2"
 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
-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
-
 # Dependencies
 sudo sed -i -e "s|main$|main contrib non-free|g" /etc/apt/sources.list
 sudo apt-get update