diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2015-04-15 10:59:38 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2015-04-15 21:53:50 +0000 |
| commit | 873472a8013d1d77298c347507c51be1ee1b2375 (patch) | |
| tree | a75272fc544048df71778bec60407ade8266a3b3 | |
| parent | 84a3d292f81a5fa2c827eca3b31501f2c3d973e5 (diff) | |
| parent | b0cf660583d47ae85c1cbd322ab6741bfca47b07 (diff) | |
| download | vyos-walinuxagent-873472a8013d1d77298c347507c51be1ee1b2375.tar.gz vyos-walinuxagent-873472a8013d1d77298c347507c51be1ee1b2375.zip | |
Import patches-applied version 2.0.12-0ubuntu2 to applied/ubuntu/vivid-proposed
Imported using git-ubuntu import.
Changelog parent: 84a3d292f81a5fa2c827eca3b31501f2c3d973e5
Unapplied parent: b0cf660583d47ae85c1cbd322ab6741bfca47b07
New changelog entries:
* Fixed systemd unit file which caused SharedConfig.xml to be deleted by
Cloud-init (LP: #1444086).
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/fix-waagent-service.patch | 7 | ||||
| -rw-r--r-- | distro/systemd/walinuxagent.service | 5 |
3 files changed, 15 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 121361a..c4dddd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ +walinuxagent (2.0.12-0ubuntu2) vivid; urgency=medium + + * Fixed systemd unit file which caused SharedConfig.xml to be deleted by + Cloud-init (LP: #1444086). + + -- Ben Howard <ben.howard@ubuntu.com> Wed, 15 Apr 2015 10:59:38 -0600 + walinuxagent (2.0.12-0ubuntu1) vivid; urgency=medium - * New upstream release. + * New upstream release (LP: #1442392). * Added debian/watch for easier maintenance. * Fix regression of missing dataloss warning by adding systemd unit file. diff --git a/debian/patches/fix-waagent-service.patch b/debian/patches/fix-waagent-service.patch index a44cd75..b00ccb0 100644 --- a/debian/patches/fix-waagent-service.patch +++ b/debian/patches/fix-waagent-service.patch @@ -16,13 +16,14 @@ -WantedBy=multi-user.target --- /dev/null +++ b/distro/systemd/walinuxagent.service -@@ -0,0 +1,13 @@ +@@ -0,0 +1,14 @@ +[Unit] +Description=Windows Azure Linux Agent -+After=network.target -+Wants=sshd.service sshd-keygen.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 ++ConditionVirtualization=microsoft + +[Service] +Type=simple diff --git a/distro/systemd/walinuxagent.service b/distro/systemd/walinuxagent.service index 9177258..2438a0a 100644 --- a/distro/systemd/walinuxagent.service +++ b/distro/systemd/walinuxagent.service @@ -1,9 +1,10 @@ [Unit] Description=Windows Azure Linux Agent -After=network.target -Wants=sshd.service sshd-keygen.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 +ConditionVirtualization=microsoft [Service] Type=simple |