diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2015-10-09 13:23:39 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2015-10-11 21:39:02 +0000 |
| commit | 7a87eeff84a5126739f53a65ca2f490bcb09f820 (patch) | |
| tree | bb5fa4b83bda706d873f930540126b1f07bcf34a | |
| parent | ade966c05615a08ba26a66d777b68821b65cabf2 (diff) | |
| parent | ced0f5b7586aa91e71d84c10490315f94df8b4bf (diff) | |
| download | vyos-walinuxagent-7a87eeff84a5126739f53a65ca2f490bcb09f820.tar.gz vyos-walinuxagent-7a87eeff84a5126739f53a65ca2f490bcb09f820.zip | |
Import patches-applied version 2.1.1-0ubuntu2 to applied/ubuntu/wily-proposed
Imported using git-ubuntu import.
Changelog parent: ade966c05615a08ba26a66d777b68821b65cabf2
Unapplied parent: ced0f5b7586aa91e71d84c10490315f94df8b4bf
New changelog entries:
* Add support for upstart or systemd (LP: #1505001).
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 10 | ||||
| -rw-r--r-- | debian/walinuxagent.upstart | 25 |
4 files changed, 40 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 566015a..6b2796e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +walinuxagent (2.1.1-0ubuntu2) wily; urgency=medium + + * Add support for upstart or systemd (LP: #1505001). + + -- Ben Howard <ben.howard@ubuntu.com> Fri, 09 Oct 2015 13:23:39 -0600 + walinuxagent (2.1.1-0ubuntu1) wily; urgency=medium * New upstream release for Ubuntu. diff --git a/debian/control b/debian/control index a10e57e..0c26eb8 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Depends: cloud-init (>=0.7.3~bzr826-0ubuntu2), openssh-server (>=1:5.9p1), openssl (>=1.0), passwd (>=4.1.4.2), - python (>= 2.4), util-linux (>=2.0), ${misc:Depends}, ${python:Depends} diff --git a/debian/rules b/debian/rules index bb65f43..56db7a2 100755 --- a/debian/rules +++ b/debian/rules @@ -12,4 +12,12 @@ get-packaged-orig-source: rm -rf orig_source %: - dh $@ --with python3,systemd --buildsystem=pybuild + dh $@ --with python3,systemd --buildsystem=pybuild + + +override_dh_installinit: + dh_installinit --no-restart-on-upgrade --name walinuxagent + +override_dh_systemd_enable: + dh_systemd_enable --name walinuxagent waxlinuxagent.service + diff --git a/debian/walinuxagent.upstart b/debian/walinuxagent.upstart new file mode 100644 index 0000000..a5f8a95 --- /dev/null +++ b/debian/walinuxagent.upstart @@ -0,0 +1,25 @@ +description "Windows Azure Linux agent" +author "Ben Howard <ben.howard@canonical.com>" + +start on runlevel [2345] +stop on runlevel [!2345] + +pre-start script + + [ -r /etc/default/walinuxagent ] && . /etc/default/walinuxagent + + if [ "$WALINUXAGENT_ENABLED" != "1" ]; then + stop ; exit 0 + fi + + if [ ! -x /usr/sbin/waagent ]; then + stop ; exit 0 + fi + + #Load the udf module + modprobe -b udf + +end script + +exec /usr/bin/python3 /usr/sbin/waagent -daemon + |