diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:30 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:30 -0400 |
| commit | 731b57b91cb202f07b236d6ed4041c43c2511fc5 (patch) | |
| tree | 6261c06954cbd2a5b00c7f2dafdc35217b466d32 | |
| parent | ce81f13bbf6589d49d13544072bab0e3576dd640 (diff) | |
| download | cloud-init-git-731b57b91cb202f07b236d6ed4041c43c2511fc5.tar.gz | |
Import version 0.6.3-0ubuntu1.1ubuntu/0.6.3-0ubuntu1.1
Imported using git-dsc-commit.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/fix-landscape-config.patch | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 43 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 02fc591d..324af417 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cloud-init (0.6.3-0ubuntu1.1) precise-proposed; urgency=low + + [Thomas Hervé] + * if configuration enables landscape, then set RUN=1 in /etc/default/landscape + (LP: #1042758) + + -- Scott Moser <smoser@ubuntu.com> Tue, 02 Oct 2012 10:59:05 -0400 + cloud-init (0.6.3-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/patches/fix-landscape-config.patch b/debian/patches/fix-landscape-config.patch new file mode 100644 index 00000000..c8dd06a8 --- /dev/null +++ b/debian/patches/fix-landscape-config.patch @@ -0,0 +1,34 @@ +Author: Thomas Hervé <thomas@canonical.com> +Last-Update: 2012-10-02 +Origin: upstream +Applied-Upstream: Yes, revno 649 and 645 +Description: fix landscape-client configuration + add 'RUN=1' to /etc/default/landscape-client + . + This modifies /etc/default/landscape-client to have 'RUN=1' if and only + if the cloud-config (user-data or local) was non-empty. +Bug: https://launchpad.net/bugs/1042758 + +=== modified file 'cloudinit/CloudConfig/cc_landscape.py' +--- old/cloudinit/CloudConfig/cc_landscape.py 2012-04-11 04:02:19 +0000 ++++ new/cloudinit/CloudConfig/cc_landscape.py 2012-10-02 13:57:37 +0000 +@@ -26,6 +26,7 @@ + frequency = per_instance + + lsc_client_cfg_file = "/etc/landscape/client.conf" ++lsc_client_default_file = "/etc/default/landscape-client" + + # defaults taken from stock client.conf in landscape-client 11.07.1.1-0ubuntu2 + lsc_builtincfg = { +@@ -58,6 +59,10 @@ + with open(lsc_client_cfg_file, "w") as fp: + merged.write(fp) + ++ if ls_cloudcfg: ++ with open(lsc_client_default_file, "w") as fp: ++ fp.write("RUN=1\n") ++ + log.debug("updated %s" % lsc_client_cfg_file) + + + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..4dd7fc8f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-landscape-config.patch |