diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2015-03-25 11:04:05 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2015-04-10 23:48:27 +0000 |
| commit | c40af8b3fec1b840776ca36d64b1857ed2bdd95b (patch) | |
| tree | 1a3a285788176bf6cb7d7ab3a5cf757011fcfb9f /debian/patches/disable_provisioning.patch | |
| parent | f9cd6b27fad4d9fdf557138966f2d34cae234edb (diff) | |
| download | vyos-walinuxagent-c40af8b3fec1b840776ca36d64b1857ed2bdd95b.tar.gz vyos-walinuxagent-c40af8b3fec1b840776ca36d64b1857ed2bdd95b.zip | |
Import patches-unapplied version 2.0.12-0ubuntu1 to ubuntu/vivid-proposed
Imported using git-ubuntu import.
Changelog parent: f9cd6b27fad4d9fdf557138966f2d34cae234edb
New changelog entries:
* New upstream release.
* Added debian/watch for easier maintenance.
* Fix regression of missing dataloss warning by adding systemd unit file.
Diffstat (limited to 'debian/patches/disable_provisioning.patch')
| -rw-r--r-- | debian/patches/disable_provisioning.patch | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/debian/patches/disable_provisioning.patch b/debian/patches/disable_provisioning.patch index 02a90cb..08d8ee0 100644 --- a/debian/patches/disable_provisioning.patch +++ b/debian/patches/disable_provisioning.patch @@ -1,21 +1,6 @@ -Description: Disable provisioning - On Ubuntu, provisioning requires cloud-init. We disable all the - provisioning functions for the agent. -Author: Ben Howard -Last-Update: 2013-07-11 --- a/config/waagent.conf +++ b/config/waagent.conf -@@ -1,6 +1,9 @@ - # - # Windows Azure Linux Agent Configuration - # -+# Ubuntu uses Cloud-init to provision on Windows Azure. This configuration -+# file is used to ensure that cloud-init does the prep of the disk -+# - - # Specified program is invoked with the argument "Ready" when we report ready status - # to the endpoint server. -@@ -14,29 +17,29 @@ +@@ -14,30 +14,34 @@ Role.TopologyConsumer=None # Enable instance creation @@ -45,10 +30,14 @@ Last-Update: 2013-07-11 # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. ResourceDisk.Filesystem=ext4 --# ount point for the resource disk + # Mount point for the resource disk -ResourceDisk.MountPoint=/mnt/resource -+# Mount point for the resource disk +ResourceDisk.MountPoint=/mnt ++# NOTE: Ubuntu uses Cloud-init for disk-provisioning. This will ++# unless you disable Cloud-init disk provisioning. Please see ++# /usr/share/doc/walinuxagent/99-cloud-init-disable-diskprovisioning.conf ++# # Create and use swapfile on resource disk. ResourceDisk.EnableSwap=n + |