From a00729ff7421b3661e8b1a1e0fa46393379f2e96 Mon Sep 17 00:00:00 2001
From: Ben Howard <ben.howard@ubuntu.com>
Date: Mon, 8 Feb 2016 16:33:07 -0700
Subject: Import patches-unapplied version 2.1.3-0ubuntu1 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 53f54030cae2de3d5fa474a61fe51f16c7a07c79

New changelog entries:
  * New upstream release (LP: #1543359):
    - Bug fixes for extension handling
    - Feature enablement for AzureStack.
---
 config/waagent.conf | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'config/waagent.conf')

diff --git a/config/waagent.conf b/config/waagent.conf
index 639e723..e808117 100644
--- a/config/waagent.conf
+++ b/config/waagent.conf
@@ -40,6 +40,9 @@ Provisioning.ExecuteCustomData=n
 # Length of random salt used when generating password hash.
 #Provisioning.PasswordCryptSaltLength=10
 
+# Allow reset password of sys user
+Provisioning.AllowResetSysUser=n
+
 # Format if unformatted. If 'n', resource disk will not be mounted.
 ResourceDisk.Format=y
 
@@ -71,3 +74,18 @@ OS.OpensslPath=None
 
 # Detect Scvmm environment, default is n
 # DetectScvmmEnv=n
+
+#
+# Lib.Dir=/var/lib/waagent
+
+#
+# DVD.MountPoint=/mnt/cdrom/secure
+
+#
+# Pid.File=/var/run/waagent.pid
+
+#
+# Extension.LogDir=/var/log/azure
+
+#
+# Home.Dir=/home
-- 
cgit v1.2.3