Merge branch 'development'20170120

2 files changed, 8 insertions, 1 deletions

diff --git a/google_config/bin/set_hostname b/google_config/bin/set_hostname
index 01a11ad..64aa091 100755
--- a/google_config/bin/set_hostname
+++ b/google_config/bin/set_hostname
@@ -39,6 +39,13 @@ fi
 if [ -n "$new_host_name" ]; then
   hostname "${new_host_name%%.*}"
 
+  # If NetworkManager is installed set the hostname with nmcli.
+  # to resolve issues with NetworkManager resetting the hostname
+  # to the FQDN on DHCP renew.
+  if [ -x /bin/nmcli ]; then
+    nmcli general hostname "${new_host_name%%.*}"
+  fi
+
   # Restart syslog to update the hostname if we're not using systemd.
   # systemd rsyslog jobs wait for networking to finish starting and consequently
   # syslog or rsyslog is running with the correct hostname.
diff --git a/google_config/build_packages.sh b/google_config/build_packages.sh
index ae19def..1ebec14 100755
--- a/google_config/build_packages.sh
+++ b/google_config/build_packages.sh
@@ -46,7 +46,7 @@ function build_distro() {
     --rpm-dist "${distro}" \
     --url 'https://github.com/GoogleCloudPlatform/compute-image-packages' \
     --vendor 'Google Compute Engine Team' \
-    --version '2.1.1' \
+    --version '2.1.2' \
     "${COMMON_FILES[@]}" \
     "${files[@]:2}"
 }