From d885152bedbdd289f7d6a3d24ab875fd4393bdff Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Thu, 15 Feb 2018 14:28:59 +0100 Subject: Import patches-unapplied version 2.2.21+really2.2.20-0ubuntu1~16.04.1 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: bdfe3a4fa9bd487ec5f40e829742e127476d2c8a New changelog entries: * Backport bionic version to xenial. * Revert to an older upstream release: 2.2.20 (LP: #1749589). - Rename upstream tarball to 2.2.21+really2.2.20 to end up with a temporarily higher version number than what's in the archive. * debian/patches/disable_import_test.patch: refreshed patch. --- config/suse/waagent.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config/suse/waagent.conf') diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf index e83caf3..ba50be6 100644 --- a/config/suse/waagent.conf +++ b/config/suse/waagent.conf @@ -14,8 +14,7 @@ Provisioning.DeleteRootPassword=y # Generate fresh host key pair. Provisioning.RegenerateSshHostKeyPair=y -# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto". -# The "auto" option is supported on OpenSSH 5.9 (2011) and later. +# Supported values are "rsa", "dsa" and "ecdsa". Provisioning.SshHostKeyPairType=rsa # Monitor host name changes and publish changes via DHCP requests. @@ -115,5 +114,5 @@ OS.SshDir=/etc/ssh # Add firewall rules to protect access to Azure host node services # Note: -# - The default is false to protect the state of existing VMs +# - The default is false to protect the state of exising VMs OS.EnableFirewall=y -- cgit v1.2.3