diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2013-09-26 08:21:35 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2013-09-30 19:23:28 +0000 |
| commit | 9a7207127b17470cc3aea9ce0e374717f3f36eac (patch) | |
| tree | b30fb8409edc610e95991193bd171965c7f8d6d0 | |
| parent | 12520fe4c648baf8d1cf7e0bec49146d7d380144 (diff) | |
| parent | c6ba998c06c09a65393866e77cc445f7a07b5d1d (diff) | |
| download | vyos-walinuxagent-9a7207127b17470cc3aea9ce0e374717f3f36eac.tar.gz vyos-walinuxagent-9a7207127b17470cc3aea9ce0e374717f3f36eac.zip | |
Import patches-applied version 1.3.2-0ubuntu5 to applied/ubuntu/saucy-proposed
Imported using git-ubuntu import.
Changelog parent: 12520fe4c648baf8d1cf7e0bec49146d7d380144
Unapplied parent: c6ba998c06c09a65393866e77cc445f7a07b5d1d
New changelog entries:
* disable ephemeral disk formating by default (LP: #1231490)
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/disable_disk_formating.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | waagent | 2 |
4 files changed, 24 insertions, 1 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 @@ -2237,7 +2237,7 @@ Provisioning.RegenerateSshHostKeyPair=n # Generate fresh host key pair. 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. |