Merge branch 'development'

GoogleCloudPlatform · Jan 30, 2018 · 2be240c · 2be240c
2 parents a183285 + 8ff26d9
commit 2be240c
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 17 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,20 @@
+google-compute-image-packages (2.7.5-1) stable; urgency=low
+
+  * Revert hostname setting change in Debian.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 29 Jan 2018 12:00:00 -0700
+
+google-compute-image-packages (2.7.4-1) stable; urgency=low
+
+  * Fix hostname setting in Debian.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 29 Jan 2018 12:00:00 -0700
+
 google-compute-image-packages (2.7.3-1) stable; urgency=low
 
   * Improve hostname setting and correctly restart rsyslog.
 
- -- Google Cloud Team <gc-team@google.com>  Thu, 25 Jan 2018 12:00:00 -0700 
+ -- Google Cloud Team <gc-team@google.com>  Thu, 25 Jan 2018 12:00:00 -0700
 
 google-compute-image-packages (2.7.2-2) stable; urgency=low
 

diff --git a/google_compute_engine_oslogin/Makefile b/google_compute_engine_oslogin/Makefile
@@ -4,7 +4,7 @@ BASENAME = oslogin
 NAME = google-compute-engine-$(BASENAME)
 MAJOR = 1
 MINOR = 1
-REVISION = 3
+REVISION = 4
 
 NSS_LIBRARY_NAME = libnss_$(NAME)-$(MAJOR).$(MINOR).$(REVISION).so
 NSS_LIBRARY_SONAME = libnss_$(BASENAME).so.2

diff --git a/google_compute_engine_oslogin/packaging/debian8/changelog b/google_compute_engine_oslogin/packaging/debian8/changelog
@@ -1,3 +1,9 @@
+google-compute-engine-oslogin (1.1.4-1+deb8) unstable; urgency=low
+
+  * Close socket connections when requesting metadata.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 29 Jan 2018 12:00:00 -0700
+
 google-compute-engine-oslogin (1.1.3-1+deb8) unstable; urgency=low
 
   * Change the OS Login uid restriction to allow uid 1000.

diff --git a/google_compute_engine_oslogin/packaging/debian9/changelog b/google_compute_engine_oslogin/packaging/debian9/changelog
@@ -1,3 +1,9 @@
+google-compute-engine-oslogin (1.1.4-1+deb9) unstable; urgency=low
+
+  * Close socket connections when requesting metadata.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 29 Jan 2018 12:00:00 -0700
+
 google-compute-engine-oslogin (1.1.3-1+deb9) unstable; urgency=low
 
   * Change the OS Login uid restriction to allow uid 1000.

diff --git a/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links b/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links
@@ -1 +1 @@
-/lib/libnss_google-compute-engine-oslogin-1.1.3.so /lib/libnss_oslogin.so.2
+/lib/libnss_google-compute-engine-oslogin-1.1.4.so /lib/libnss_oslogin.so.2
diff --git a/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec b/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 Name:           google-compute-engine-oslogin
-Version:        1.1.3
+Version:        1.1.4
 Release:        1%{?dist}
 Summary:        OS Login Functionality for Google Compute Engine
 

diff --git a/google_compute_engine_oslogin/packaging/setup_deb.sh b/google_compute_engine_oslogin/packaging/setup_deb.sh
@@ -20,7 +20,7 @@
 
 # Run from the top of the source directory.
 NAME="google-compute-engine-oslogin"
-VERSION="1.1.3"
+VERSION="1.1.4"
 
 working_dir=${PWD}
 

diff --git a/google_compute_engine_oslogin/packaging/setup_rpm.sh b/google_compute_engine_oslogin/packaging/setup_rpm.sh
@@ -20,7 +20,7 @@
 
 # Run from the top of the source directory.
 NAME="google-compute-engine-oslogin"
-VERSION="1.1.3"
+VERSION="1.1.4"
 
 working_dir=${PWD}
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}

diff --git a/google_config/bin/google_set_hostname b/google_config/bin/google_set_hostname
@@ -37,27 +37,22 @@ fi
 # unqualified domain name.
 
 if [ -n "$new_host_name" ]; then
-  hostnamectl=$( which hostnamectl 2> /dev/null )
-  if [ -x "$hostnamectl" ]; then
-    $hostnamectl set-hostname "$new_host_name"
-  fi
-  # Also set the transient hostname.
   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.
-  nmcli=$( which nmcli 2> /dev/null )
+  nmcli=$(which nmcli 2> /dev/null)
   if [ -x "$nmcli" ]; then
     nmcli general hostname "${new_host_name%%.*}"
   fi
 
   # Restart rsyslog to update the hostname.
-  systemctl=$( which systemctl 2> /dev/null )
+  systemctl=$(which systemctl 2> /dev/null)
   if [ -f /etc/init.d/rsyslog ]; then
     /etc/init.d/rsyslog restart
   elif [ -x "$systemctl" ]; then
-    hasrsyslog=$( $systemctl | grep rsyslog | cut -f1 -d' ' )
+    hasrsyslog=$($systemctl | grep rsyslog | cut -f1 -d' ')
     if [ ! -z "$hasrsyslog" ]; then
       $systemctl -q --no-block restart "$hasrsyslog"
     fi

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@
     packages=setuptools.find_packages(),
     scripts=glob.glob('scripts/*'),
     url='https://github.com/GoogleCloudPlatform/compute-image-packages',
-    version='2.7.3',
+    version='2.7.5',
     # Entry points create scripts in /usr/bin that call a function.
     entry_points={
         'console_scripts': [

diff --git a/specs/google-compute-engine.spec b/specs/google-compute-engine.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name: google-compute-engine
-Version: 2.7.3
+Version: 2.7.5
 Release: 1%{?dist}
 Summary: Google Compute Engine guest environment.
 License: ASL 2.0

diff --git a/specs/python-google-compute-engine.spec b/specs/python-google-compute-engine.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name: python-google-compute-engine
-Version: 2.7.3
+Version: 2.7.5
 Release: 1%{?dist}
 Summary: Google Compute Engine python library
 License: ASL 2.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/lib/libnss_google-compute-engine-oslogin-1.1.3.so /lib/libnss_oslogin.so.2
		/lib/libnss_google-compute-engine-oslogin-1.1.4.so /lib/libnss_oslogin.so.2