From 88f6f4f0abd2e9e477504ca590d82c5728c9923b Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 9 Oct 2015 13:23:39 -0600 Subject: Import patches-unapplied version 2.1.1-0ubuntu2 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: f78b9650d0e7b008d430673a075aad95dda863be New changelog entries: * Add support for upstart or systemd (LP: #1505001). --- debian/changelog | 6 ++++++ debian/control | 1 - debian/rules | 10 +++++++++- debian/walinuxagent.upstart | 25 +++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 debian/walinuxagent.upstart 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 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 " + +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 + -- cgit v1.2.3 From 7751580d6ec65dee214945904f5c74a27aa1ab34 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 9 Oct 2015 13:23:39 -0600 Subject: cloud-init-default-cfg.patch No DEP3 Subject or Description header found Gbp-Pq: cloud-init-default-cfg.patch. --- config/91_walinuxagent.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/91_walinuxagent.cfg diff --git a/config/91_walinuxagent.cfg b/config/91_walinuxagent.cfg new file mode 100644 index 0000000..b7049fc --- /dev/null +++ b/config/91_walinuxagent.cfg @@ -0,0 +1,3 @@ +# This configuration file is provided by the WALinuxAgent package. +datasource_list: [ Azure ] + -- cgit v1.2.3 From 709a33c9857e05c76e7aba008a537253e282d742 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 9 Oct 2015 13:23:39 -0600 Subject: start-after-cloudinit.patch No DEP3 Subject or Description header found Gbp-Pq: start-after-cloudinit.patch. --- init/ubuntu/walinuxagent.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/ubuntu/walinuxagent.service b/init/ubuntu/walinuxagent.service index 1a67835..e7780b8 100755 --- a/init/ubuntu/walinuxagent.service +++ b/init/ubuntu/walinuxagent.service @@ -1,7 +1,7 @@ [Unit] Description=Azure Linux Agent -After=network.target -After=sshd.service +After=network-online.target cloud-final.service +Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service ConditionFileIsExecutable=/usr/sbin/waagent ConditionPathExists=/etc/waagent.conf -- cgit v1.2.3 From df6eef3405edf6eb5e643e1336d88dbc6a76e51e Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 9 Oct 2015 13:23:39 -0600 Subject: disable-udev-rules-removal.patch No DEP3 Subject or Description header found Gbp-Pq: disable-udev-rules-removal.patch. --- azurelinuxagent/distro/ubuntu/osutil.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azurelinuxagent/distro/ubuntu/osutil.py b/azurelinuxagent/distro/ubuntu/osutil.py index 1e51c2a..dcd730c 100644 --- a/azurelinuxagent/distro/ubuntu/osutil.py +++ b/azurelinuxagent/distro/ubuntu/osutil.py @@ -44,6 +44,9 @@ class Ubuntu14xOSUtil(DefaultOSUtil): def start_agent_service(self): return shellutil.run("service walinuxagent start", chk_err=False) + def remove_rules_files(self, *args): + return + class Ubuntu1204OSUtil(Ubuntu14xOSUtil): def __init__(self): super(Ubuntu1204OSUtil, self).__init__() -- cgit v1.2.3 From ced0f5b7586aa91e71d84c10490315f94df8b4bf Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 9 Oct 2015 13:23:39 -0600 Subject: disable-provisioning.patch No DEP3 Subject or Description header found Gbp-Pq: disable-provisioning.patch. --- config/ubuntu/waagent.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf index ab50418..3afb839 100644 --- a/config/ubuntu/waagent.conf +++ b/config/ubuntu/waagent.conf @@ -42,7 +42,7 @@ ResourceDisk.Format=n ResourceDisk.Filesystem=ext4 # Mount point for the resource disk -ResourceDisk.MountPoint=/mnt/resource +ResourceDisk.MountPoint=/mnt # Create and use swapfile on resource disk. ResourceDisk.EnableSwap=n -- cgit v1.2.3