diff options
| author | Scott Moser <smoser@brickies.net> | 2017-08-31 20:01:57 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2017-08-31 20:01:57 -0600 |
| commit | fa266bf8818a08e37cd32a603d076ba2db300124 (patch) | |
| tree | 80a809e50b1a948470a016270b6e9680c56aa45b /packages | |
| parent | 1770a1eb647d24e14732194e72210ea494986ad2 (diff) | |
| download | vyos-cloud-init-fa266bf8818a08e37cd32a603d076ba2db300124.tar.gz vyos-cloud-init-fa266bf8818a08e37cd32a603d076ba2db300124.zip | |
upstart: do not package upstart jobs, drop ubuntu-init-switch module.
The ubuntu-init-switch module allowed the use to launch an instance that
was booted with upstart and have it switch its init system to systemd and
then reboot itself. It was only useful for the time period when Ubuntu was
transitioning to systemd but only produced images using upstart.
Also, do not run setup with --init-system=upstart. This means that by
default, debian packages built with packages/bddeb will not have upstart
unit files included. No other removal is done here.
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/bddeb | 3 | ||||
| -rw-r--r-- | packages/debian/dirs | 1 | ||||
| -rwxr-xr-x | packages/debian/rules.in | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/packages/bddeb b/packages/bddeb index 609a94fb..7c123548 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -112,8 +112,7 @@ def get_parser(): parser.add_argument("--init-system", dest="init_system", help=("build deb with INIT_SYSTEM=xxx" " (default: %(default)s"), - default=os.environ.get("INIT_SYSTEM", - "upstart,systemd")) + default=os.environ.get("INIT_SYSTEM", "systemd")) parser.add_argument("--release", dest="release", help=("build with changelog referencing RELEASE"), diff --git a/packages/debian/dirs b/packages/debian/dirs index 9a633c60..1315cf8a 100644 --- a/packages/debian/dirs +++ b/packages/debian/dirs @@ -1,6 +1,5 @@ var/lib/cloud usr/bin -etc/init usr/share/doc/cloud etc/cloud lib/udev/rules.d diff --git a/packages/debian/rules.in b/packages/debian/rules.in index 053b7649..b87a5e84 100755 --- a/packages/debian/rules.in +++ b/packages/debian/rules.in @@ -1,6 +1,6 @@ ## template:basic #!/usr/bin/make -f -INIT_SYSTEM ?= upstart,systemd +INIT_SYSTEM ?= systemd export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM) PYVER ?= python${pyver} |