From 4479117f30c1d6e7bf6d1161dbd589c39c6a14c4 Mon Sep 17 00:00:00 2001
From: Chris Sharp <csharp@georgialibraries.org>
Date: Thu, 29 Jun 2017 12:01:32 -0400
Subject: [PATCH] Add systemd-friendly hostname settings to drone and generic
 host setup.

---
 templates/setup-drone.sh | 11 ++++++++++-
 templates/setup.sh       | 19 +++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/templates/setup-drone.sh b/templates/setup-drone.sh
index d02d8a7..eced7c8 100755
--- a/templates/setup-drone.sh
+++ b/templates/setup-drone.sh
@@ -67,7 +67,16 @@ echo
 echo $(date) >> "$INSTALL_LOG"
 echo "Setting Hostname"
 sleep 2
-echo "drone_file" > /etc/hostname
+# supported Debian releases and Ubuntu 16.04 are on systemd
+# so check to see if we're running 14.04, otherwise, we're 
+# on a systemd-based system
+#Get_OS_Distro
+if [ "$OSDISTRO" == "Ubuntu" ] && [ "$OSRELEASE" == "14.04" ]; then
+    echo "drone_file" > /etc/hostname
+    start hostname
+else
+    hostnamectl set-hostname "drone_file"
+fi
 tar zxvf drone_file_etc-hosts.tar.gz -C /
 sed -i 's/^domain.*/domain CLUSTER_DOMAINNAME/g' /etc/resolv.conf
 sed -i 's/^search.*/search CLUSTER_DOMAINNAME/g' /etc/resolv.conf
diff --git a/templates/setup.sh b/templates/setup.sh
index 15ef8e1..97691c2 100755
--- a/templates/setup.sh
+++ b/templates/setup.sh
@@ -62,17 +62,16 @@ echo
 ### Set hostname.
 echo "Setting Hostname"
 sleep 2
-echo "tar_file" > /etc/hostname
-# Get_OS_Distro
-if [ "$OSDISTRO" == "Ubuntu" ] 
-	then
-	start hostname
-		else
-		/etc/init.d/hostname.sh 
+# supported Debian releases and Ubuntu 16.04 are on systemd
+# so check to see if we're running 14.04, otherwise, we're 
+# on a systemd-based system
+#Get_OS_Distro
+if [ "$OSDISTRO" == "Ubuntu" ] && [ "$OSRELEASE" == "14.04" ]; then
+    echo "tar_file" > /etc/hostname
+    start hostname
+else
+    hostnamectl set-hostname "tar_file"
 fi
-		
-		
-
 
 ### xtract /etc/hosts files.
 echo "Files Installed"
-- 
2.11.0