diff -Nru walinuxagent-1.3.2/debian/changelog walinuxagent-1.3.2/debian/changelog --- walinuxagent-1.3.2/debian/changelog 2013-08-16 03:31:43.000000000 +0000 +++ walinuxagent-1.3.2/debian/changelog 2013-10-16 19:32:24.000000000 +0000 @@ -1,3 +1,10 @@ +walinuxagent (1.3.2-0ubuntu4~12.04.5) precise-proposed; urgency=low + + * Disable ephemeral format functions by default; this is now handled in + cloud-init by default (LP: #1231490). + + -- Ben Howard Fri, 11 Oct 2013 15:42:12 -0600 + walinuxagent (1.3.2-0ubuntu4~12.04.4) precise; urgency=low * Update versioned cloud-init dependency for the precise version. diff -Nru walinuxagent-1.3.2/debian/control walinuxagent-1.3.2/debian/control --- walinuxagent-1.3.2/debian/control 2013-08-16 03:30:31.000000000 +0000 +++ walinuxagent-1.3.2/debian/control 2013-10-16 00:48:29.000000000 +0000 @@ -11,7 +11,7 @@ Package: walinuxagent Architecture: amd64 i386 Pre-Depends: walinuxagent-data-saver (= ${binary:Version}) -Depends: cloud-init (>= 0.6.3-0ubuntu1.6), +Depends: cloud-init (>= 0.6.3-0ubuntu1.8), linux-image-extra-virtual, openssh-server (>=1:5.9p1), openssl (>=1.0), diff -Nru walinuxagent-1.3.2/debian/patches/disable_disk_formating.patch walinuxagent-1.3.2/debian/patches/disable_disk_formating.patch --- walinuxagent-1.3.2/debian/patches/disable_disk_formating.patch 1970-01-01 00:00:00.000000000 +0000 +++ walinuxagent-1.3.2/debian/patches/disable_disk_formating.patch 2013-10-16 00:48:29.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Disable disk formatting/mounting of ephemeral storage + Disabling this code segment as redundant with Cloud Init +Bug: https://bugs.launchpad.net/ubuntu/+bug/1231490 +Author: Ben Howard +Last-Update: 2013-09-26 +--- a/waagent ++++ b/waagent +@@ -2237,7 +2237,7 @@ Provisioning.RegenerateSshHostKeyPair=n + Provisioning.SshHostKeyPairType=rsa # Supported values are "rsa", "dsa" and "ecdsa". + 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.Format=n # Format if unformatted. If 'n', resource disk will not be mounted. + ResourceDisk.Filesystem=ext4 # + ResourceDisk.MountPoint=/mnt # + ResourceDisk.EnableSwap=n # Create and use swapfile on resource disk. diff -Nru walinuxagent-1.3.2/debian/patches/series walinuxagent-1.3.2/debian/patches/series --- walinuxagent-1.3.2/debian/patches/series 2013-08-15 16:20:37.000000000 +0000 +++ walinuxagent-1.3.2/debian/patches/series 2013-10-16 00:48:29.000000000 +0000 @@ -2,3 +2,4 @@ config_for_cloud-init.patch verbose_logging.patch shadow_permissions.patch +disable_disk_formating.patch