diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-03 19:11:25 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-03 19:11:25 -0500 |
| commit | 29fc924565a730c51eb56a6f953453857d0183ca (patch) | |
| tree | 031b50f61436fd41b339ba01354211280588a78b /packages/debian/rules.in | |
| parent | 77a9dbb4aa7e555d4c033c54a60b7084b2ab3373 (diff) | |
| parent | 2231c45ac3712c5cb7c1b810c838d3f91f424bf2 (diff) | |
| download | vyos-cloud-init-29fc924565a730c51eb56a6f953453857d0183ca.tar.gz vyos-cloud-init-29fc924565a730c51eb56a6f953453857d0183ca.zip | |
merge with trunk
Diffstat (limited to 'packages/debian/rules.in')
| -rwxr-xr-x | packages/debian/rules.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/debian/rules.in b/packages/debian/rules.in index d6cd23ae..66e80946 100755 --- a/packages/debian/rules.in +++ b/packages/debian/rules.in @@ -1,9 +1,8 @@ ## template:basic #!/usr/bin/make -f - INIT_SYSTEM ?= upstart,systemd -PYVER ?= python${pyver} export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM) +PYVER ?= python${pyver} %: dh $@ --with $(PYVER),systemd --buildsystem pybuild @@ -14,6 +13,7 @@ override_dh_install: cp tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf override_dh_auto_test: - # Because setup tools didn't copy data... - [ ! -d .pybuild/pythonX.Y_?.?/build/tests ] || cp -r tests/data .pybuild/pythonX.Y_?.?/build/tests http_proxy= make check + +override_dh_systemd_start: + dh_systemd_start --no-restart-on-upgrade --no-start |