diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-09-20 13:50:44 -0400 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-09-20 18:54:41 +0000 |
| commit | aedea9e08c54c1b0afba81e499ab1ecd4b03891a (patch) | |
| tree | 0285e3e0f8178d8463de5c0113a7a4310e624266 | |
| parent | 0975452c01c135f674546ba9b6d4451049af9d1e (diff) | |
| parent | 77774b476b8458e03f349bd72e1c86c3bf7007db (diff) | |
| download | vyos-walinuxagent-aedea9e08c54c1b0afba81e499ab1ecd4b03891a.tar.gz vyos-walinuxagent-aedea9e08c54c1b0afba81e499ab1ecd4b03891a.zip | |
Import patches-applied version 2.1.5-0ubuntu3 to applied/ubuntu/yakkety-proposed
Imported using git-ubuntu import.
Changelog parent: 0975452c01c135f674546ba9b6d4451049af9d1e
Unapplied parent: 77774b476b8458e03f349bd72e1c86c3bf7007db
New changelog entries:
* debian/ephemeral-disk-warning.service: add a description
* debian/ephemeral-disk-warning.service: fix ordering cycle
(LP: #1624596)
* d/66-azure-storage.rules, d/install: fix dangling symlink in
at /lib/udev/rules.d/66-azure-storage.rules.
| l--------- | debian/66-azure-storage.rules | 1 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/ephemeral-disk-warning.service | 5 | ||||
| -rw-r--r-- | debian/install | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/debian/66-azure-storage.rules b/debian/66-azure-storage.rules deleted file mode 120000 index 461db71..0000000 --- a/debian/66-azure-storage.rules +++ /dev/null @@ -1 +0,0 @@ -../config/66-azure-storage.rules
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 2d25cf0..5b1306f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +walinuxagent (2.1.5-0ubuntu3) yakkety; urgency=medium + + * debian/ephemeral-disk-warning.service: add a description + * debian/ephemeral-disk-warning.service: fix ordering cycle + (LP: #1624596) + * d/66-azure-storage.rules, d/install: fix dangling symlink in + at /lib/udev/rules.d/66-azure-storage.rules. + + -- Scott Moser <smoser@ubuntu.com> Tue, 20 Sep 2016 13:50:44 -0400 + walinuxagent (2.1.5-0ubuntu2) yakkety; urgency=medium * debian/walinuxagent.service: remove cloud-final.service from diff --git a/debian/ephemeral-disk-warning.service b/debian/ephemeral-disk-warning.service index 7bc0fe7..294ac2a 100644 --- a/debian/ephemeral-disk-warning.service +++ b/debian/ephemeral-disk-warning.service @@ -1,6 +1,6 @@ [Unit] -Description= -After=cloud-final.service +Description=Write warning to Azure ephemeral disk +After=cloud-config.service ConditionVirtualization=microsoft ConditionPathIsMountPoint=/mnt ConditionPathExists=/dev/disk/azure/resource-part1 @@ -13,4 +13,3 @@ StandardOutput=journal+console [Install] WantedBy=multi-user.target - diff --git a/debian/install b/debian/install index 5cfd70b..1406e8d 100644 --- a/debian/install +++ b/debian/install @@ -1,8 +1,8 @@ config/91_walinuxagent.cfg etc/cloud/cloud.cfg.d +config/66-azure-storage.rules lib/udev/rules.d debian/ephemeral-disk-warning.service lib/systemd/system debian/ephemeral-disk-warning.conf etc/init debian/ephemeral-disk-warning.sh usr/sbin -debian/66-azure-storage.rules lib/udev/rules.d debian/67-azure-console.rules lib/udev/rules.d debian/68-azure-nm-unmanaged.rules lib/udev/rules.d debian/azure-resource usr/share/initramfs-tools/hooks |