Import patches-unapplied version 1.3.2-0ubuntu3 to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 6cf5a13dd65bc0abf70a3874f11d5b61b26dce2b

New changelog entries:
  [ 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.

3 files changed, 38 insertions, 1 deletions

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