From f78b9650d0e7b008d430673a075aad95dda863be Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 14 Aug 2015 16:40:41 -0600 Subject: Import patches-unapplied version 2.1.1-0ubuntu1 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 0afc048f2a6ff3638ecfa33e7ded5dc8dddf041a New changelog entries: * New upstream release for Ubuntu. - Switch to Python3 - Applies Ubuntu specific patches --- debian/patches/disable_provisioning.patch | 55 ------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 debian/patches/disable_provisioning.patch (limited to 'debian/patches/disable_provisioning.patch') diff --git a/debian/patches/disable_provisioning.patch b/debian/patches/disable_provisioning.patch deleted file mode 100644 index 956d30b..0000000 --- a/debian/patches/disable_provisioning.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/config/waagent.conf -+++ b/config/waagent.conf -@@ -2,6 +2,11 @@ - # Windows Azure Linux Agent Configuration - # - -+# 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 -+# -+ - # Specified program is invoked with the argument "Ready" when we report ready status - # to the endpoint server. - Role.StateConsumer=None -@@ -14,19 +19,19 @@ - Role.TopologyConsumer=None - - # Enable instance creation --Provisioning.Enabled=y -+Provisioning.Enabled=n - - # Password authentication for root account will be unavailable. --Provisioning.DeleteRootPassword=y -+Provisioning.DeleteRootPassword=n - - # Generate fresh host key pair. --Provisioning.RegenerateSshHostKeyPair=y -+Provisioning.RegenerateSshHostKeyPair=n - - # Supported values are "rsa", "dsa" and "ecdsa". - Provisioning.SshHostKeyPairType=rsa - - # Monitor host name changes and publish changes via DHCP requests. --Provisioning.MonitorHostName=y -+Provisioning.MonitorHostName=n - - # Decode CustomData from Base64. - Provisioning.DecodeCustomData=n -@@ -35,14 +40,14 @@ - Provisioning.ExecuteCustomData=n - - # Format if unformatted. If 'n', resource disk will not be mounted. --ResourceDisk.Format=y -+ResourceDisk.Format=n - - # File system on the resource disk - # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. - ResourceDisk.Filesystem=ext4 - - # Mount point for the resource disk --ResourceDisk.MountPoint=/mnt/resource -+ResourceDisk.MountPoint=/mnt - - # Create and use swapfile on resource disk. - ResourceDisk.EnableSwap=n -- cgit v1.2.3