diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-09-14 13:06:56 -0400 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-09-14 19:19:12 +0000 |
| commit | 0975452c01c135f674546ba9b6d4451049af9d1e (patch) | |
| tree | c92ee33f1425b3af638c83778ada644acf252d58 | |
| parent | 4a992af5bc223c74489ce6a4f965adffb0b627c7 (diff) | |
| parent | f6ae386a6923e361699a49b6111c16916c5b9158 (diff) | |
| download | vyos-walinuxagent-0975452c01c135f674546ba9b6d4451049af9d1e.tar.gz vyos-walinuxagent-0975452c01c135f674546ba9b6d4451049af9d1e.zip | |
Import patches-applied version 2.1.5-0ubuntu2 to applied/ubuntu/yakkety-proposed
Imported using git-ubuntu import.
Changelog parent: 4a992af5bc223c74489ce6a4f965adffb0b627c7
Unapplied parent: f6ae386a6923e361699a49b6111c16916c5b9158
New changelog entries:
* debian/walinuxagent.service: remove cloud-final.service from
both Wants and After. (LP: #1623570)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | init/ubuntu/walinuxagent.service | 4 |
4 files changed, 43 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ed5f944..2d25cf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +walinuxagent (2.1.5-0ubuntu2) yakkety; urgency=medium + + * debian/walinuxagent.service: remove cloud-final.service from + both Wants and After. (LP: #1623570) + + -- Scott Moser <smoser@ubuntu.com> Wed, 14 Sep 2016 13:06:56 -0400 + walinuxagent (2.1.5-0ubuntu1) yakkety; urgency=medium * New upstream release (LP: #1603581) diff --git a/debian/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch b/debian/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch new file mode 100644 index 0000000..bb034cf --- /dev/null +++ b/debian/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch @@ -0,0 +1,33 @@ +Description: walinuxagent.service: adjust Wants and After + There is no reason for walinuxagent.service to Want + cloud-final.service. That could cause problems if cloud-init was + disabled. + . + There is also no reason for it to need to run After cloud-final. + Instead replace that with After of cloud-init. That will ensure + that cloud-init in its datasource code has an opportunity affect + walinuxagent before it starts. + . + The need for this is because cloud-init was starting walinux.service + during cloud-init.service, which would cause unresolvable + cyclic dependencies. +Author: Scott Moser <smoser@ubuntu.com> +Forwarded: https://github.com/Azure/WALinuxAgent/pull/426 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1623570 +Bug-Upstream: https://github.com/Azure/WALinuxAgent/issues/425 +Last-Update: 2016-09-14 + + +--- a/init/ubuntu/walinuxagent.service ++++ b/init/ubuntu/walinuxagent.service +@@ -7,8 +7,8 @@ + [Unit] + Description=Azure Linux Agent + +-After=network-online.target cloud-final.service +-Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service ++After=network-online.target cloud-init.service ++Wants=network-online.target sshd.service sshd-keygen.service + + ConditionFileIsExecutable=/usr/sbin/waagent + ConditionPathExists=/etc/waagent.conf diff --git a/debian/patches/series b/debian/patches/series index 452e72a..8c08198 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ disable-auto-update.patch cloud-init-default-cfg.patch disable_import_test.patch disable_udev_overrides.patch +lp1623570-adjust-walinuxagent-service-after-and-wants.patch diff --git a/init/ubuntu/walinuxagent.service b/init/ubuntu/walinuxagent.service index ae8dccb..3cf47c5 100755 --- a/init/ubuntu/walinuxagent.service +++ b/init/ubuntu/walinuxagent.service @@ -7,8 +7,8 @@ [Unit] Description=Azure Linux Agent -After=network-online.target cloud-final.service -Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service +After=network-online.target cloud-init.service +Wants=network-online.target sshd.service sshd-keygen.service ConditionFileIsExecutable=/usr/sbin/waagent ConditionPathExists=/etc/waagent.conf |