diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:39 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:39 -0400 |
| commit | 0ec34747b61845bfce806065dd126dcb56fe4672 (patch) | |
| tree | 87d11be4050b8c6d5a96356c66c0cf4e3f61195f | |
| parent | 7aa1c8e7d36fb68b1a3f020fbcbd45e4b0d1e9aa (diff) | |
| download | vyos-cloud-init-0ec34747b61845bfce806065dd126dcb56fe4672.tar.gz vyos-cloud-init-0ec34747b61845bfce806065dd126dcb56fe4672.zip | |
Import version 0.7.7~bzr1160-0ubuntu1
Imported using git-dsc-commit.
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/systemd_detect_virt.patch | 29 |
3 files changed, 9 insertions, 30 deletions
diff --git a/debian/changelog b/debian/changelog index 8299adc9..98c1583e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +cloud-init (0.7.7~bzr1160-0ubuntu1) xenial; urgency=medium + + * New upstream snapshot. + * SmartOS: Add support for Joyent LX-Brand Zones (LP: #1540965) + * systemd/power_state: fix power_state when cloud-final exited failure + (LP: #1449318) + + -- Scott Moser <smoser@ubuntu.com> Thu, 04 Feb 2016 17:22:36 -0500 + cloud-init (0.7.7~bzr1156-0ubuntu2) xenial; urgency=medium * debian/cloud-init.postinst, systemd_detect_virt.patch: Call diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index d07203f9..00000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -systemd_detect_virt.patch diff --git a/debian/patches/systemd_detect_virt.patch b/debian/patches/systemd_detect_virt.patch deleted file mode 100644 index 32961a20..00000000 --- a/debian/patches/systemd_detect_virt.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: Use systemd-detect-virt to detect a container. running-in-container is an Ubuntu-ism and going away. -Author: Martin Pitt <martin.pitt@ubuntu.com> -Forwarded: https://code.launchpad.net/~pitti/cloud-init/systemd-detect-virt/+merge/284278 -Bug-Ubuntu: https://launchpad.net/bugs/1539016 - -Index: cloud-init-0.7.7~bzr1156/cloudinit/util.py -=================================================================== ---- cloud-init-0.7.7~bzr1156.orig/cloudinit/util.py -+++ cloud-init-0.7.7~bzr1156/cloudinit/util.py -@@ -76,7 +76,9 @@ FALSE_STRINGS = ('off', '0', 'no', 'fals - - - # Helper utils to see if running in a container --CONTAINER_TESTS = ('running-in-container', 'lxc-is-container') -+CONTAINER_TESTS = (['systemd-detect-virt', '--quiet', '--container'], -+ ['running-in-container'], -+ ['lxc-is-container']) - - - def decode_binary(blob, encoding='utf-8'): -@@ -1749,7 +1751,7 @@ def is_container(): - try: - # try to run a helper program. if it returns true/zero - # then we're inside a container. otherwise, no -- subp([helper]) -+ subp(helper) - return True - except (IOError, OSError): - pass |