From 4dd53399757958295f2e813f27279d3651a02344 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Mon, 16 Sep 2019 15:57:55 -0700 Subject: Fix EL6 spec to not call systemctl and put that logic back in the EL7+ spec (#848) --- .../google-compute-engine/packaging/google-compute-engine-el6.spec | 5 ----- packages/google-compute-engine/packaging/google-compute-engine.spec | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec index 5555b20..ffa5c74 100644 --- a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec +++ b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec @@ -60,11 +60,6 @@ ln -sf /usr/bin/google_set_hostname %{buildroot}/etc/dhcp/dhclient-exit-hooks %config /etc/sysctl.d/* %post -if [ $1 -eq 2 ]; then - # New service might not be enabled during upgrade. - systemctl enable google-network-daemon.service -fi - # On upgrade run instance setup again to handle any new configs and restart # daemons. if [ $1 -eq 2 ]; then diff --git a/packages/google-compute-engine/packaging/google-compute-engine.spec b/packages/google-compute-engine/packaging/google-compute-engine.spec index 1ec37dc..3d0560e 100644 --- a/packages/google-compute-engine/packaging/google-compute-engine.spec +++ b/packages/google-compute-engine/packaging/google-compute-engine.spec @@ -66,6 +66,11 @@ cp -a src/lib/udev/rules.d/* %{buildroot}/%{_udevrulesdir} %config /etc/sysctl.d/* %post +if [ $1 -eq 2 ]; then + # New service might not be enabled during upgrade. + systemctl enable google-network-daemon.service +fi + # On upgrade run instance setup again to handle any new configs and restart # daemons. if [ $1 -eq 2 ]; then -- cgit v1.2.1