Merge branch 'development'20170829

15 files changed, 58 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index c89fa10..1a25349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+google-compute-image-packages (2.6.0-4) stable; urgency=low
+
+  * Fix DHCP exit hook install.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 28 Aug 2017 12:00:00 -0700
+
+google-compute-image-packages (2.6.0-3) stable; urgency=low
+
+  * Add systemd preset.
+
+ -- Google Cloud Team <gc-team@google.com>  Fri, 25 Aug 2017 14:00:00 -0700
+
+google-compute-image-packages (2.6.0-2) stable; urgency=low
+
+  * Add DHCP exit hook script back into package.
+
+ -- Google Cloud Team <gc-team@google.com>  Fri, 25 Aug 2017 12:00:00 -0700
+
 google-compute-image-packages (2.6.0-1) stable; urgency=low
 
   * New packaging.
diff --git a/debian/google-compute-engine.install b/debian/google-compute-engine.install
index 2b4b2bc..75d0c0b 100644
--- a/debian/google-compute-engine.install
+++ b/debian/google-compute-engine.install
@@ -1,4 +1,6 @@
 google_compute_engine_init/systemd/*.service lib/systemd/system
+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/rsyslog/* etc/rsyslog.d
 google_config/sysctl/* etc/sysctl.d
 google_config/udev/* lib/udev/rules.d
diff --git a/disk_expand/90-gce-disk-expand.preset b/disk_expand/90-gce-disk-expand.preset
new file mode 100644
index 0000000..c7fba01
--- /dev/null
+++ b/disk_expand/90-gce-disk-expand.preset
@@ -0,0 +1 @@
+enable expand-root.service
diff --git a/disk_expand/build_packages.sh b/disk_expand/build_packages.sh
index c3ef36b..7879a5f 100755
--- a/disk_expand/build_packages.sh
+++ b/disk_expand/build_packages.sh
@@ -28,12 +28,14 @@ for spec_file in ${SPEC_FILES}; do
   mkdir -p ${RPM_TOP}/SOURCES/etc/init.d
   mkdir -p ${RPM_TOP}/SOURCES/usr/bin
   mkdir -p ${RPM_TOP}/SOURCES/usr/lib/systemd/system
+  mkdir -p ${RPM_TOP}/SOURCES/usr/lib/systemd/system-preset
   mkdir -p ${RPM_TOP}/SOURCES/usr/share/dracut/modules.d/50growroot
 
   cp expand-root ${RPM_TOP}/SOURCES/etc/init.d
   cp expand-root ${RPM_TOP}/SOURCES/usr/bin
   cp third_party/cloud-utils/* ${RPM_TOP}/SOURCES/usr/bin
   cp expand-root.service ${RPM_TOP}/SOURCES/usr/lib/systemd/system
+  cp 90-gce-disk-expand.preset ${RPM_TOP}/SOURCES/usr/lib/systemd/system-preset
   cp third_party/dracut-modules-growroot/* \
     ${RPM_TOP}/SOURCES/usr/share/dracut/modules.d/50growroot
 
diff --git a/disk_expand/gce-disk-expand-el7.spec b/disk_expand/gce-disk-expand-el7.spec
index f70e827..065ec56 100644
--- a/disk_expand/gce-disk-expand-el7.spec
+++ b/disk_expand/gce-disk-expand-el7.spec
@@ -13,7 +13,7 @@
 # limitations under the License.
 Name: gce-disk-expand
 Summary: Google Compute Engine root disk expansion utilities for EL7
-Version: 1.0.3
+Version: 1.0.4
 Release: %(date +%s).el7
 License: GPLv3, Apache Software License
 Group: System Environment/Base
@@ -39,6 +39,7 @@ cp -R $RPM_SOURCE_DIR/usr $RPM_BUILD_ROOT
 %attr(755,root,root) /usr/bin/expand-root
 %attr(755,root,root) /usr/bin/growpart
 %attr(644,root,root) /usr/lib/systemd/system/expand-root.service
+%attr(644,root,root) /usr/lib/systemd/system-preset/90-gce-disk-expand.preset
 
 %post
 %systemd_post expand-root.service
@@ -47,7 +48,7 @@ sed -i 's/defaults,barrier=1/defaults/' /etc/fstab
 restorecon /etc/fstab
 
 %preun
-%systemd_preun expand-root.service
-
-%postun
-%systemd_postun expand-root.service
+# On uninstall only.
+if [ $1 -eq 0 ]; then
+  %systemd_preun expand-root.service
+fi
diff --git a/google_compute_engine_init/systemd/90-google-compute-engine.preset b/google_compute_engine_init/systemd/90-google-compute-engine.preset
new file mode 100644
index 0000000..e2674ac
--- /dev/null
+++ b/google_compute_engine_init/systemd/90-google-compute-engine.preset
@@ -0,0 +1,7 @@
+enable google-accounts-daemon.service
+enable google-clock-skew-daemon.service
+enable google-instance-setup.service
+enable google-ip-forwarding-daemon.service
+enable google-network-setup.service
+enable google-shutdown-scripts.service
+enable google-startup-scripts.service
diff --git a/google_compute_engine_oslogin/Makefile b/google_compute_engine_oslogin/Makefile
index f925191..c9be86e 100644
--- 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 = 0
-REVISION = 2
+REVISION = 3
 
 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
index 145dd63..71f29a9 100644
--- 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.0.3-1+deb8) unstable; urgency=low
+
+  * Strictly check for HTTP code 200.
+
+ -- MAINTAINER <gc-team@google.com>  Tue, 25 Aug 2017 12:00:00 -0700
+
 google-compute-engine-oslogin (1.0.2-1+deb8) unstable; urgency=low
 
   * Improve security in case of transient errors.
diff --git a/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links b/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links
index 8556e22..536c746 100644
--- a/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links
+++ b/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links
@@ -1 +1 @@
-/lib/libnss_google-compute-engine-oslogin-1.0.2.so /lib/libnss_oslogin.so.2
+/lib/libnss_google-compute-engine-oslogin-1.0.3.so /lib/libnss_oslogin.so.2
diff --git a/google_compute_engine_oslogin/packaging/debian9/changelog b/google_compute_engine_oslogin/packaging/debian9/changelog
index d4759dc..69a352d 100644
--- 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.0.3-1+deb9) unstable; urgency=low
+
+  * Strictly check for HTTP code 200.
+
+ -- MAINTAINER <gc-team@google.com>  Tue, 25 Aug 2017 12:00:00 -0700
+
 google-compute-engine-oslogin (1.0.2-1+deb9) unstable; urgency=low
 
   * Improve security in case of transient errors.
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
index 8556e22..536c746 100644
--- 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.0.2.so /lib/libnss_oslogin.so.2
+/lib/libnss_google-compute-engine-oslogin-1.0.3.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
index 2537958..52594cd 100644
--- 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.0.2
+Version:        1.0.3
 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
index 9f1e173..a7f3f44 100755
--- 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.0.2"
+VERSION="1.0.3"
 
 working_dir=${PWD}
 
diff --git a/google_compute_engine_oslogin/packaging/setup_rpm.sh b/google_compute_engine_oslogin/packaging/setup_rpm.sh
index 05c15bc..a09fa04 100755
--- 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.0.2"
+VERSION="1.0.3"
 
 working_dir=${PWD}
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
diff --git a/specs/google-compute-engine.spec b/specs/google-compute-engine.spec
index 06bcb05..36f08fa 100644
--- a/specs/google-compute-engine.spec
+++ b/specs/google-compute-engine.spec
@@ -19,7 +19,7 @@
 
 Name: google-compute-engine
 Version: 2.6.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: Google Compute Engine guest environment.
 License: ASL 2.0
 Url: https://github.com/GoogleCloudPlatform/compute-image-packages
@@ -78,7 +78,9 @@ cp google_config/sbin/google-dhclient-script %{buildroot}/sbin/
 %if 0%{?el7}
 mkdir -p %{buildroot}/etc/dhcp/dhclient.d
 mkdir -p %{buildroot}%{_unitdir}
+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/dhcp/google_hostname.sh %{buildroot}/etc/dhcp/dhclient.d/google_hostname.sh
 %endif
@@ -94,6 +96,7 @@ cp google_config/dhcp/google_hostname.sh %{buildroot}/etc/dhcp/dhclient.d/google
 %if 0%{?el7}
 %attr(0755,root,root) /etc/dhcp/dhclient.d/google_hostname.sh
 %{_unitdir}/*.service
+%{_presetdir}/90-google-compute-engine.preset
 %endif
 %config /etc/rsyslog.d/90-google.conf
 %config /etc/sysctl.d/11-gce-network-security.conf