7 files changed, 73 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index a183fc7..62edfb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+walinuxagent (1.3.2-0ubuntu3) saucy; urgency=low
+
+  [ Ben Howard ]
+  * debian/patches/config_for_cloud-init.patch:
+    Modified configuration to disable provisioning functions.
+    walinuxagent for Ubuntu should now be used with Cloud-init.
+  * debian/postinst: Don't overwrite existing /etc/waagent.conf agent
+    configuration on install or upgrade.
+  * debian/upstart: start later in boot, avoiding race conditions
+    with cloud-init.
+
+  [ Scott Moser ]
+  * debian: wrap and sort directory
+  * debian/patches/no_udev_rule_removal.patch: remove 000 prefix in file
+    name. No need for numbering in filenames when we have patches/series.
+
+ -- Scott Moser <smoser@ubuntu.com>  Thu, 11 Jul 2013 17:31:05 -0400
+
 walinuxagent (1.3.2-0ubuntu2) saucy; urgency=low
 
   * Added logic to prevent udev rules.d movement (LP: #1188753)
diff --git a/debian/control b/debian/control
index a49d3d0..7d2ac0f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,14 +9,15 @@ XS-Python-Version: all
 Homepage: http://go.microsoft.com/fwlink/?LinkId=250998
 
 Package: walinuxagent
-Architecture: i386 amd64
+Architecture: amd64 i386
 Pre-Depends: walinuxagent-data-saver (= ${binary:Version})
-Depends: python (>= 2.4),
-         openssl (>=1.0),
+Depends: cloud-init (>=0.7.3~bzr826-0ubuntu2),
+         linux-image-extra-virtual,
          openssh-server (>=1:5.9p1),
+         openssl (>=1.0),
          passwd (>=4.1.4.2),
+         python (>= 2.4),
          util-linux (>=2.0),
-         linux-image-extra-virtual,
          ${misc:Depends},
          ${python:Depends}
 Conflicts: network-manager
@@ -26,7 +27,7 @@ Description: Windows Azure Linux Agent
  disk images that are built to run in the Windows Azure environment.
 
 Package: walinuxagent-data-saver
-Architecture: i386 amd64
+Architecture: amd64 i386
 Depends: ${misc:Depends}
 Description: Helper package which ensures safe upgrade for walinuxagent
  Early versions of walinuxagent contained a bug the deleted configuration and
diff --git a/debian/patches/config_for_cloud-init.patch b/debian/patches/config_for_cloud-init.patch
new file mode 100644
index 0000000..19fddad
--- /dev/null
+++ b/debian/patches/config_for_cloud-init.patch
@@ -0,0 +1,36 @@
+Description: Disable provisioning components in config
+ This disables the provisioning components of walinux-agent.
+ Cloud-init in newest versions can provide these same services.
+Author: Ben Howard
+Last-Update: 2013-07-11
+--- a/waagent
++++ b/waagent
+@@ -2222,6 +2222,7 @@ exit 0
+ WaagentConf = """\
+ #
+ # Windows Azure Linux Agent Configuration
++# This configuration is modified to work with Cloud-init
+ #
+ 
+ Role.StateConsumer=None                 # Specified program is invoked with "Ready" or "Shutdown".
+@@ -2230,15 +2231,15 @@ Role.StateConsumer=None
+ Role.ConfigurationConsumer=None         # Specified program is invoked with XML file argument specifying role configuration.
+ Role.TopologyConsumer=None              # Specified program is invoked with XML file argument specifying role topology.
+ 
+-Provisioning.Enabled=y                  #
+-Provisioning.DeleteRootPassword=y       # Password authentication for root account will be unavailable.
+-Provisioning.RegenerateSshHostKeyPair=y # Generate fresh host key pair.
++Provisioning.Enabled=n                  #
++Provisioning.DeleteRootPassword=n       # Password authentication for root account will be unavailable.
++Provisioning.RegenerateSshHostKeyPair=n # Generate fresh host key pair.
+ Provisioning.SshHostKeyPairType=rsa     # Supported values are "rsa", "dsa" and "ecdsa".
+-Provisioning.MonitorHostName=y          # Monitor host name changes and publish changes via DHCP requests.
++Provisioning.MonitorHostName=n          # Monitor host name changes and publish changes via DHCP requests.
+ 
+ ResourceDisk.Format=y                   # Format if unformatted. If 'n', resource disk will not be mounted.
+ ResourceDisk.Filesystem=ext4            #
+-ResourceDisk.MountPoint=/mnt/resource   #
++ResourceDisk.MountPoint=/mnt            #
+ ResourceDisk.EnableSwap=n               # Create and use swapfile on resource disk.
+ ResourceDisk.SwapSizeMB=0               # Size of the swapfile.
+ 
diff --git a/debian/patches/000_no_udev_rule_removal.patch b/debian/patches/no_udev_rule_removal.patch
index 40a10d0..40a10d0 100644
--- a/debian/patches/000_no_udev_rule_removal.patch
+++ b/debian/patches/no_udev_rule_removal.patch
diff --git a/debian/patches/series b/debian/patches/series
index 92e4a67..939d7ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-000_no_udev_rule_removal.patch
+no_udev_rule_removal.patch
+config_for_cloud-init.patch
diff --git a/debian/postinst b/debian/postinst
index 20aaccd..aeb33d8 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -7,7 +7,17 @@ fi
 
 case "$1" in
     configure)
+
+        if [ -e /etc/waagent.conf ]; then
+            mv /etc/waagent.conf /etc/waagent.conf.save
+        fi
+
         waagent --setup --force
+
+        if [ -e /etc/waagent.conf.save ]; then
+            mv /etc/waagent.conf /etc/waagent.conf.dpkg-dist
+            mv /etc/waagent.conf.save /etc/waagent.conf
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/upstart b/debian/upstart
index 780f19d..4ba35bc 100644
--- a/debian/upstart
+++ b/debian/upstart
@@ -1,7 +1,7 @@
 description "Windows Azure Linux agent"
 author "Ben Howard <ben.howard@canonical.com>"
 
-start on mounted MOUNTPOINT=/
+start on runlevel [2345]
 stop on runlevel [!2345]
 
 pre-start script