diff options
| author | Zach Marano <zmarano@google.com> | 2017-08-24 12:06:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 12:06:02 -0700 |
| commit | 2a55259fc0761f40777c122b6d54f675d85fd690 (patch) | |
| tree | 1ee98ee7c877ed185694e231f3ee52343f8f63a7 | |
| parent | 5bd64b36faf2ccd1ebe67ba278268d3802c06fd2 (diff) | |
| download | google-compute-image-packages-2a55259fc0761f40777c122b6d54f675d85fd690.tar.gz | |
Fix EL postinst ordering and use optional for Debian package. (#468)
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | specs/google-compute-engine.spec | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/control b/debian/control index 1a9daf5..2f05710 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: google-compute-image-packages Section: admin -Priority: extra +Priority: optional Maintainer: Google Cloud Team <gc-team@google.com> Build-Depends: debhelper (>= 9), dh-python, diff --git a/specs/google-compute-engine.spec b/specs/google-compute-engine.spec index a744aa9..06bcb05 100644 --- a/specs/google-compute-engine.spec +++ b/specs/google-compute-engine.spec @@ -105,10 +105,13 @@ cp google_config/dhcp/google_hostname.sh %{buildroot}/etc/dhcp/dhclient.d/google %if 0%{?el6} # On upgrade run instance setup again to handle any new configs and restart daemons. if [ $1 -eq 2 ]; then - restart -q -n google-accounts-daemon - restart -q -n google-clock-skew-daemon - restart -q -n google-ip-forwarding-daemon + stop -q -n google-accounts-daemon + stop -q -n google-clock-skew-daemon + stop -q -n google-ip-forwarding-daemon /usr/bin/google_instance_setup + start -q -n google-accounts-daemon + start -q -n google-clock-skew-daemon + start -q -n google-ip-forwarding-daemon fi # Install google-compute-engine from pypi into the SCL environment if it exists. @@ -131,10 +134,10 @@ fi %systemd_post google-startup-scripts.service # On upgrade run instance setup again to handle any new configs and restart daemons. if [ $1 -eq 2 ]; then + /usr/bin/google_instance_setup systemctl reload-or-restart google-accounts-daemon.service systemctl reload-or-restart google-clock-skew-daemon.service systemctl reload-or-restart google-ip-forwarding-daemon.service - /usr/bin/google_instance_setup fi %endif |