diff -Nru gce-compute-image-packages-20171019+dfsg1/debian/changelog gce-compute-image-packages-20171025+dfsg1/debian/changelog --- gce-compute-image-packages-20171019+dfsg1/debian/changelog 2017-10-25 09:29:28.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/debian/changelog 2017-11-03 15:04:54.000000000 +0000 @@ -1,4 +1,20 @@ -gce-compute-image-packages (20171019+dfsg1-0ubuntu1~16.04.0) xenial; urgency=medium +gce-compute-image-packages (20171025+dfsg1-0ubuntu1~16.04.0) xenial; urgency=medium + + [ Balint Reczey ] + * New upstream version 20171025+dfsg1 (LP: #1729046) + - Update set_hostname file name to prevent conflict + - Add apt config to prevent auto-removal of google-compute-engine + - Remove logging when checking OS Login status + * Update symlink to shared library with updated patch version + * Update packaging for changing set_hostname to google_set_hostname + * Ship apt config to prevent auto-removal of google-compute-engine + + [ Łukasz 'sil2100' Zemczak ] + * Backport to xenial. + + -- Łukasz 'sil2100' Zemczak Fri, 03 Nov 2017 16:04:54 +0100 + +gce-compute-image-packages (20171019+dfsg1-0ubuntu1) artful; urgency=medium [ Balint Reczey ] * New upstream version 20171019+dfsg1 (LP: #1726810) @@ -15,9 +31,6 @@ gce-compute-image-packages.{postinst|prerm} * Make google-compute-engine depend on google-compute-engine-oslogin - [ Łukasz 'sil2100' Zemczak ] - * Backport to xenial. - -- Balint Reczey Tue, 24 Oct 2017 16:35:46 +0200 gce-compute-image-packages (20171006+dfsg1-0ubuntu1) artful; urgency=medium diff -Nru gce-compute-image-packages-20171019+dfsg1/debian/gce-compute-image-packages.install gce-compute-image-packages-20171025+dfsg1/debian/gce-compute-image-packages.install --- gce-compute-image-packages-20171019+dfsg1/debian/gce-compute-image-packages.install 2017-10-24 15:45:20.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/debian/gce-compute-image-packages.install 2017-10-31 17:23:49.000000000 +0000 @@ -4,7 +4,8 @@ google_config/sysctl/* etc/sysctl.d google_config/udev/* lib/udev/rules.d google_compute_engine_init/systemd/90-google-compute-engine.preset lib/systemd/system-preset -google_config/bin/set_hostname etc/dhcp/dhclient-exit-hooks.d +google_config/apt/01autoremove-gce etc/apt/apt.conf.d +google_config/bin/google_set_hostname etc/dhcp/dhclient-exit-hooks.d # Ubuntu-specific configuration debian/instance_configs.cfg.distro etc/default diff -Nru gce-compute-image-packages-20171019+dfsg1/debian/google-compute-engine-oslogin.links gce-compute-image-packages-20171025+dfsg1/debian/google-compute-engine-oslogin.links --- gce-compute-image-packages-20171019+dfsg1/debian/google-compute-engine-oslogin.links 2017-10-24 15:45:20.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/debian/google-compute-engine-oslogin.links 2017-10-31 17:23:49.000000000 +0000 @@ -1 +1 @@ -lib/libnss_google-compute-engine-oslogin-1.1.0.so lib/libnss_oslogin.so.2 +lib/libnss_google-compute-engine-oslogin-1.1.1.so lib/libnss_oslogin.so.2 diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/bin/google_oslogin_control gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/bin/google_oslogin_control --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/bin/google_oslogin_control 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/bin/google_oslogin_control 2017-10-25 18:40:23.000000000 +0000 @@ -191,10 +191,8 @@ get_status() { if grep "^passwd:" ${nss_config} | grep -q "oslogin"; then - echo "Google Compute Engine OS Login is active." exit 0 else - echo "Google Compute Engine OS Login is not active." exit 3 fi } diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/Makefile gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/Makefile --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/Makefile 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/Makefile 2017-10-25 18:40:23.000000000 +0000 @@ -4,7 +4,7 @@ NAME = google-compute-engine-$(BASENAME) MAJOR = 1 MINOR = 1 -REVISION = 0 +REVISION = 1 NSS_LIBRARY_NAME = libnss_$(NAME)-$(MAJOR).$(MINOR).$(REVISION).so NSS_LIBRARY_SONAME = libnss_$(BASENAME).so.2 diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/debian8/changelog gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/debian8/changelog --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/debian8/changelog 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/debian8/changelog 2017-10-25 18:40:23.000000000 +0000 @@ -1,3 +1,9 @@ +google-compute-engine-oslogin (1.1.1-1+deb8) unstable; urgency=low + + * Remove logging when checking OS Login status. + + -- MAINTAINER Wed, 25 Oct 2017 12:00:00 -0700 + google-compute-engine-oslogin (1.1.0-1+deb8) unstable; urgency=low * OS Login is enabled via the google-compute-engine package. diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links 2017-10-25 18:40:23.000000000 +0000 @@ -1 +1 @@ -/lib/libnss_google-compute-engine-oslogin-1.1.0.so /lib/libnss_oslogin.so.2 +/lib/libnss_google-compute-engine-oslogin-1.1.1.so /lib/libnss_oslogin.so.2 diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/debian9/changelog gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/debian9/changelog --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/debian9/changelog 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/debian9/changelog 2017-10-25 18:40:23.000000000 +0000 @@ -1,3 +1,9 @@ +google-compute-engine-oslogin (1.1.1-1+deb9) unstable; urgency=low + + * Remove logging when checking OS Login status. + + -- MAINTAINER Wed, 25 Oct 2017 12:00:00 -0700 + google-compute-engine-oslogin (1.1.0-1+deb9) unstable; urgency=low * OS Login is enabled via the google-compute-engine package. diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links 2017-10-25 18:40:23.000000000 +0000 @@ -1 +1 @@ -/lib/libnss_google-compute-engine-oslogin-1.1.0.so /lib/libnss_oslogin.so.2 +/lib/libnss_google-compute-engine-oslogin-1.1.1.so /lib/libnss_oslogin.so.2 diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec 2017-10-25 18:40:23.000000000 +0000 @@ -13,7 +13,7 @@ # limitations under the License. Name: google-compute-engine-oslogin -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} Summary: OS Login Functionality for Google Compute Engine diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/setup_deb.sh gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/setup_deb.sh --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/setup_deb.sh 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/setup_deb.sh 2017-10-25 18:40:23.000000000 +0000 @@ -20,7 +20,7 @@ # Run from the top of the source directory. NAME="google-compute-engine-oslogin" -VERSION="1.1.0" +VERSION="1.1.1" working_dir=${PWD} diff -Nru gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/setup_rpm.sh gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/setup_rpm.sh --- gce-compute-image-packages-20171019+dfsg1/google_compute_engine_oslogin/packaging/setup_rpm.sh 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_compute_engine_oslogin/packaging/setup_rpm.sh 2017-10-25 18:40:23.000000000 +0000 @@ -20,7 +20,7 @@ # Run from the top of the source directory. NAME="google-compute-engine-oslogin" -VERSION="1.1.0" +VERSION="1.1.1" working_dir=${PWD} rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION} diff -Nru gce-compute-image-packages-20171019+dfsg1/google_config/apt/01autoremove-gce gce-compute-image-packages-20171025+dfsg1/google_config/apt/01autoremove-gce --- gce-compute-image-packages-20171019+dfsg1/google_config/apt/01autoremove-gce 1970-01-01 00:00:00.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_config/apt/01autoremove-gce 2017-10-25 18:40:23.000000000 +0000 @@ -0,0 +1,10 @@ +APT +{ + NeverAutoRemove + { + "gce-compute-image-packages.*"; + "google-compute-engine.*"; + "python-google-compute-engine.*"; + "python3-google-compute-engine.*"; + }; +}; diff -Nru gce-compute-image-packages-20171019+dfsg1/google_config/bin/google_set_hostname gce-compute-image-packages-20171025+dfsg1/google_config/bin/google_set_hostname --- gce-compute-image-packages-20171019+dfsg1/google_config/bin/google_set_hostname 1970-01-01 00:00:00.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_config/bin/google_set_hostname 2017-10-25 18:40:23.000000000 +0000 @@ -0,0 +1,55 @@ +#!/bin/bash +# Copyright 2016 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Deal with a new hostname assignment. + +if [ -n "$new_host_name" ] && [ -n "$new_ip_address" ]; then + # Delete entries with new_host_name or new_ip_address in /etc/hosts. + sed -i '/Added by Google/d' /etc/hosts + + # Add an entry for our new_host_name/new_ip_address in /etc/hosts. + echo "${new_ip_address} ${new_host_name} ${new_host_name%%.*} # Added by Google" >> /etc/hosts + + # Add an entry for reaching the metadata server in /etc/hosts. + echo "169.254.169.254 metadata.google.internal # Added by Google" >> /etc/hosts +fi + +# /sbin/dhclient-scripts in both ubuntu and centos have some problems for us: +# 1) BOUND doesn't always set hostname (e.g. if old_host_name is unset in +# precise pangolin) +# 2) Using too long of a FQDN as a hostname causes some tools to break in +# some distros (e.g. ssh-keygen) and hostname tool complains when given +# a FQDN that is > 64 bytes. +# +# As a result, we set the host name in all circumstances here, to the truncated +# unqualified domain name. + +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. + if [ ! -f /bin/systemctl ]; then + pkill -HUP syslogd + fi +fi diff -Nru gce-compute-image-packages-20171019+dfsg1/google_config/bin/set_hostname gce-compute-image-packages-20171025+dfsg1/google_config/bin/set_hostname --- gce-compute-image-packages-20171019+dfsg1/google_config/bin/set_hostname 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_config/bin/set_hostname 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -#!/bin/bash -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Deal with a new hostname assignment. - -if [ -n "$new_host_name" ] && [ -n "$new_ip_address" ]; then - # Delete entries with new_host_name or new_ip_address in /etc/hosts. - sed -i '/Added by Google/d' /etc/hosts - - # Add an entry for our new_host_name/new_ip_address in /etc/hosts. - echo "${new_ip_address} ${new_host_name} ${new_host_name%%.*} # Added by Google" >> /etc/hosts - - # Add an entry for reaching the metadata server in /etc/hosts. - echo "169.254.169.254 metadata.google.internal # Added by Google" >> /etc/hosts -fi - -# /sbin/dhclient-scripts in both ubuntu and centos have some problems for us: -# 1) BOUND doesn't always set hostname (e.g. if old_host_name is unset in -# precise pangolin) -# 2) Using too long of a FQDN as a hostname causes some tools to break in -# some distros (e.g. ssh-keygen) and hostname tool complains when given -# a FQDN that is > 64 bytes. -# -# As a result, we set the host name in all circumstances here, to the truncated -# unqualified domain name. - -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. - if [ ! -f /bin/systemctl ]; then - pkill -HUP syslogd - fi -fi diff -Nru gce-compute-image-packages-20171019+dfsg1/google_config/dhcp/google_hostname.sh gce-compute-image-packages-20171025+dfsg1/google_config/dhcp/google_hostname.sh --- gce-compute-image-packages-20171019+dfsg1/google_config/dhcp/google_hostname.sh 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/google_config/dhcp/google_hostname.sh 2017-10-25 18:40:23.000000000 +0000 @@ -14,7 +14,7 @@ # limitations under the License. google_hostname_config() { - set_hostname + google_set_hostname } google_hostname_restore() { : diff -Nru gce-compute-image-packages-20171019+dfsg1/setup.py gce-compute-image-packages-20171025+dfsg1/setup.py --- gce-compute-image-packages-20171019+dfsg1/setup.py 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/setup.py 2017-10-25 18:40:23.000000000 +0000 @@ -32,7 +32,7 @@ packages=setuptools.find_packages(), scripts=glob.glob('scripts/*'), url='https://github.com/GoogleCloudPlatform/compute-image-packages', - version='2.7.0', + version='2.7.1', # Entry points create scripts in /usr/bin that call a function. entry_points={ 'console_scripts': [ diff -Nru gce-compute-image-packages-20171019+dfsg1/specs/google-compute-engine.spec gce-compute-image-packages-20171025+dfsg1/specs/google-compute-engine.spec --- gce-compute-image-packages-20171019+dfsg1/specs/google-compute-engine.spec 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/specs/google-compute-engine.spec 2017-10-25 18:40:23.000000000 +0000 @@ -18,7 +18,7 @@ %endif Name: google-compute-engine -Version: 2.7.0 +Version: 2.7.1 Release: 1%{?dist} Summary: Google Compute Engine guest environment. License: ASL 2.0 @@ -73,7 +73,7 @@ mkdir %{buildroot}/sbin mkdir -p %{buildroot}/etc/init cp google_compute_engine_init/upstart/*.conf %{buildroot}/etc/init/ -cp google_config/bin/set_hostname %{buildroot}/etc/dhcp/dhclient-exit-hooks +cp google_config/bin/google_set_hostname %{buildroot}/etc/dhcp/dhclient-exit-hooks cp google_config/sbin/google-dhclient-script %{buildroot}/sbin/ %endif @@ -83,7 +83,7 @@ mkdir -p %{buildroot}%{_presetdir} cp google_compute_engine_init/systemd/*.service %{buildroot}%{_unitdir} cp google_compute_engine_init/systemd/90-google-compute-engine.preset %{buildroot}%{_presetdir}/90-google-compute-engine.preset -cp google_config/bin/set_hostname %{buildroot}%{_bindir} +cp google_config/bin/google_set_hostname %{buildroot}%{_bindir} cp google_config/dhcp/google_hostname.sh %{buildroot}/etc/dhcp/dhclient.d/google_hostname.sh %endif diff -Nru gce-compute-image-packages-20171019+dfsg1/specs/python-google-compute-engine.spec gce-compute-image-packages-20171025+dfsg1/specs/python-google-compute-engine.spec --- gce-compute-image-packages-20171019+dfsg1/specs/python-google-compute-engine.spec 2017-10-18 21:56:59.000000000 +0000 +++ gce-compute-image-packages-20171025+dfsg1/specs/python-google-compute-engine.spec 2017-10-25 18:40:23.000000000 +0000 @@ -18,7 +18,7 @@ %endif Name: python-google-compute-engine -Version: 2.7.0 +Version: 2.7.1 Release: 1%{?dist} Summary: Google Compute Engine python library License: ASL 2.0