summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/disable_disk_formating.patch16
-rw-r--r--debian/patches/series1
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 68ace8c..2a66fee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+walinuxagent (1.3.2-0ubuntu5) saucy; urgency=low
+
+ * disable ephemeral disk formating by default (LP: #1231490)
+
+ -- Ben Howard <ben.howard@ubuntu.com> Thu, 26 Sep 2013 08:21:35 -0600
+
walinuxagent (1.3.2-0ubuntu4) saucy; urgency=low
* debian/patches/shadow_permissions.patch: apply the appropriate
diff --git a/debian/patches/disable_disk_formating.patch b/debian/patches/disable_disk_formating.patch
new file mode 100644
index 0000000..feef91b
--- /dev/null
+++ b/debian/patches/disable_disk_formating.patch
@@ -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 --git a/debian/patches/series b/debian/patches/series
index d355c91..25d7a66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ no_udev_rule_removal.patch
config_for_cloud-init.patch
verbose_logging.patch
shadow_permissions.patch
+disable_disk_formating.patch