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

4 files changed, 81 insertions, 38 deletions

diff --git a/config/99-azure-product-uuid.rules b/config/99-azure-product-uuid.rules
deleted file mode 100644
index a5af9b1..0000000
--- a/config/99-azure-product-uuid.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBSYSTEM!="dmi", GOTO="product_uuid-exit"
-ATTR{sys_vendor}!="Microsoft Corporation", GOTO="product_uuid-exit"
-ATTR{product_name}!="Virtual Machine", GOTO="product_uuid-exit"
-TEST!="/sys/devices/virtual/dmi/id/product_uuid", GOTO="product_uuid-exit"
-
-RUN+="/bin/chmod 0444 /sys/devices/virtual/dmi/id/product_uuid"
-
-LABEL="product_uuid-exit"
-
diff --git a/config/docker-waagent.conf b/config/suse/waagent.conf
index def7231..e429c74 100644
--- a/config/docker-waagent.conf
+++ b/config/suse/waagent.conf
@@ -20,7 +20,7 @@ Provisioning.Enabled=y
 Provisioning.DeleteRootPassword=y
 
 # Generate fresh host key pair.
-Provisioning.RegenerateSshHostKeyPair=n
+Provisioning.RegenerateSshHostKeyPair=y
 
 # Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
@@ -39,7 +39,7 @@ ResourceDisk.Format=y
 
 # File system on the resource disk
 # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here.
-ResourceDisk.Filesystem=ext4
+ResourceDisk.Filesystem=ext3
 
 # Mount point for the resource disk
 ResourceDisk.MountPoint=/mnt/resource
@@ -53,23 +53,18 @@ ResourceDisk.SwapSizeMB=0
 # Respond to load balancer probes if requested by Windows Azure.
 LBProbeResponder=y
 
-# File to write log to.
-# '/var/log/waagent.log' if not set
-Logs.File=/dev/stdout
-
-# Enable logging to serial console (y|n)
-# When stdout is not enough...
-# 'y' if not set
-Logs.Console=n
-
 # Enable verbose logging (y|n)
 Logs.Verbose=n
 
-# Preferred network interface to communicate with Azure platform
-Network.Interface=eth0
-
 # Root device timeout in seconds.
 OS.RootDeviceScsiTimeout=300
 
 # If "None", the system default version is used.
 OS.OpensslPath=None
+
+# If set, agent will use proxy server to access internet
+#HttpProxy.Host=None
+#HttpProxy.Port=None
+
+# Detect Scvmm environment, default is n
+# DetectScvmmEnv=n
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
new file mode 100644
index 0000000..ab50418
--- /dev/null
+++ b/config/ubuntu/waagent.conf
@@ -0,0 +1,70 @@
+#
+# Windows Azure Linux Agent Configuration
+#
+
+# Specified program is invoked with the argument "Ready" when we report ready status
+# to the endpoint server.
+Role.StateConsumer=None
+
+# Specified program is invoked with XML file argument specifying role
+#  configuration.
+Role.ConfigurationConsumer=None
+
+# Specified program is invoked with XML file argument specifying role topology.
+Role.TopologyConsumer=None
+
+# Enable instance creation
+Provisioning.Enabled=n
+
+# Password authentication for root account will be unavailable.
+Provisioning.DeleteRootPassword=y
+
+# Generate fresh host key pair.
+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=n
+
+# Decode CustomData from Base64.
+Provisioning.DecodeCustomData=n
+
+# Execute CustomData after provisioning.
+Provisioning.ExecuteCustomData=n
+
+# Format if unformatted. If 'n', resource disk will not be mounted.
+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
+
+# Create and use swapfile on resource disk.
+ResourceDisk.EnableSwap=n
+
+# Size of the swapfile.
+ResourceDisk.SwapSizeMB=0
+
+# Respond to load balancer probes if requested by Windows Azure.
+LBProbeResponder=y
+
+# Enable verbose logging (y|n)
+Logs.Verbose=n
+
+# Root device timeout in seconds.
+OS.RootDeviceScsiTimeout=300
+
+# If "None", the system default version is used.
+OS.OpensslPath=None
+
+# If set, agent will use proxy server to access internet
+#HttpProxy.Host=None
+#HttpProxy.Port=None
+
+# Detect Scvmm environment, default is n
+# DetectScvmmEnv=n
diff --git a/config/waagent.conf b/config/waagent.conf
index 97da2b9..4435d56 100644
--- a/config/waagent.conf
+++ b/config/waagent.conf
@@ -50,24 +50,9 @@ ResourceDisk.EnableSwap=n
 # Size of the swapfile.
 ResourceDisk.SwapSizeMB=0
 
-# Respond to load balancer probes if requested by Windows Azure.
-LBProbeResponder=y
-
-# File to write log to.
-# '/var/log/waagent.log' if not set
-Logs.File=/var/log/waagent.log
-
-# Enable logging to serial console (y|n)
-# When stdout is not enough...
-# 'y' if not set
-Logs.Console=y
-
 # Enable verbose logging (y|n)
 Logs.Verbose=n
 
-# Preferred network interface to communicate with Azure platform
-#Network.Interface=eth0
-
 # Root device timeout in seconds.
 OS.RootDeviceScsiTimeout=300
 
@@ -78,3 +63,5 @@ OS.OpensslPath=None
 #HttpProxy.Host=None
 #HttpProxy.Port=None
 
+# Detect Scvmm environment, default is n
+# DetectScvmmEnv=n