Merge lp:~ubuntu-branches/ubuntu/natty/cloud-init/natty-201101272214 into lp:ubuntu/natty/cloud-init

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/cloud-init now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/cloud-init/natty-201101272214. A merge should be performed if necessary.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-01-27 22:21:24 +0000
@@ -0,0 +1,1 @@
+.pc
 
=== added file 'debian/README.source'
--- debian/README.source	1970-01-01 00:00:00 +0000
+++ debian/README.source	2011-01-27 22:21:24 +0000
@@ -0,0 +1,11 @@
+=== General Info ===
+Development packaging branch is at
+   lp:ubuntu/<suite>/cloud-init
+alternatively, if you're on the development release:
+   lp:ubuntu/cloud-init
+
+Patches in debian/patches are also stored applied in bzr.
+However, the .pc directory is not version controlled.
+
+When you've done a fresh checkout of above, you will need to run:
+   debian/rules quilt-setup
 
=== renamed file 'debian/README.source' => 'debian/README.source.moved'
=== added file 'debian/cloud-init.config'
--- debian/cloud-init.config	1970-01-01 00:00:00 +0000
+++ debian/cloud-init.config	2011-01-27 22:21:24 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+db_input low cloud-init/datasources || true
+db_go
+
+exit 0
 
=== renamed file 'debian/cloud-init.config' => 'debian/cloud-init.config.moved'
=== added file 'debian/cloud-init.templates'
--- debian/cloud-init.templates	1970-01-01 00:00:00 +0000
+++ debian/cloud-init.templates	2011-01-27 22:21:24 +0000
@@ -0,0 +1,12 @@
+Template: cloud-init/datasources
+Type: multiselect
+Default: NoCloud, OVF
+Choices-C: NoCloud, OVF, Ec2
+Choices: NoCloud: Reads info from /var/lib/cloud/seed only, OVF: Reads data from OVF Transports, Ec2: reads data from EC2 Metadata service
+Description: Which data sources should be searched?
+ Cloud-init supports searching different "Data Sources" for information
+ that it uses to configure a cloud instance.
+ .
+ Warning: Only select 'Ec2' if this system will be run on a system with
+ the EC2 metadata service present.  Doing so incorrectly will result in
+ a substantial timeout on boot.
 
=== renamed file 'debian/cloud-init.templates' => 'debian/cloud-init.templates.moved'
=== added file 'debian/patches/332-fix-perms-on-cloud-init-log.patch'
--- debian/patches/332-fix-perms-on-cloud-init-log.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/332-fix-perms-on-cloud-init-log.patch	2011-01-27 22:21:24 +0000
@@ -0,0 +1,20 @@
+------------------------------------------------------------
+revno: 332
+committer: Scott Moser <[e-mail]>
+branch nick: trunk
+timestamp: Thu 2011-01-27 09:30:37 -0500
+message:
+  fix bug in fixing permission on default log file
+--- a/cloudinit/__init__.py
++++ b/cloudinit/__init__.py
+@@ -487,8 +487,8 @@
+         log_file = cfg['def_log_file']
+         fp = open(log_file,"ab")
+         fp.close()
+-    if log_file and 'syslog' in cfg:
+-        perms = cfg['syslog']
++    if log_file and 'syslog_fix_perms' in cfg:
++        perms = cfg['syslog_fix_perms']
+         (u,g) = perms.split(':',1)
+         if u == "-1" or u == "None": u = None
+         if g == "-1" or g == "None": g = None
 
=== renamed file 'debian/patches/332-fix-perms-on-cloud-init-log.patch' => 'debian/patches/332-fix-perms-on-cloud-init-log.patch.moved'
=== added file 'debian/patches/336-rename-process-user-data-file.txt.patch'
--- debian/patches/336-rename-process-user-data-file.txt.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/336-rename-process-user-data-file.txt.patch	2011-01-27 22:21:24 +0000
@@ -0,0 +1,24 @@
+------------------------------------------------------------
+revno: 336
+committer: Scott Moser <[e-mail]>
+branch nick: trunk
+timestamp: Thu 2011-01-27 14:38:22 -0500
+message:
+  fix the filename of the processed userdata
+  
+  Change /var/lib/cloud/instance/
+     user-data-raw.txt.i 
+  to 
+     user-data.txt.i
+=== modified file 'cloudinit/__init__.py'
+--- a/cloudinit/__init__.py
++++ b/cloudinit/__init__.py
+@@ -39,7 +39,7 @@
+    "sem" : "/sem",
+    "boothooks" : "/boothooks",
+    "userdata_raw" : "/user-data.txt",
+-   "userdata" : "/user-data-raw.txt.i",
++   "userdata" : "/user-data.txt.i",
+    "obj_pkl" : "/obj.pkl",
+    "cloud_config" : "/cloud-config.txt",
+    "datadir" : "/data",
 
=== renamed file 'debian/patches/336-rename-process-user-data-file.txt.patch' => 'debian/patches/336-rename-process-user-data-file.txt.patch.moved'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-01-27 22:21:24 +0000
@@ -0,0 +1,2 @@
+332-fix-perms-on-cloud-init-log.patch
+336-rename-process-user-data-file.txt.patch
 
=== renamed file 'debian/patches/series' => 'debian/patches/series.moved'