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. --- debian/patches/disable_import_test.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian/patches/disable_import_test.patch') diff --git a/debian/patches/disable_import_test.patch b/debian/patches/disable_import_test.patch index e6b4bdb..d8e0e6b 100644 --- a/debian/patches/disable_import_test.patch +++ b/debian/patches/disable_import_test.patch @@ -1,7 +1,7 @@ -Index: walinuxagent-2.2.21/config/waagent.conf +Index: walinuxagent-2.2.21+really2.2.20/config/waagent.conf =================================================================== ---- walinuxagent-2.2.21.orig/config/waagent.conf -+++ walinuxagent-2.2.21/config/waagent.conf +--- walinuxagent-2.2.21+really2.2.20.orig/config/waagent.conf ++++ walinuxagent-2.2.21+really2.2.20/config/waagent.conf @@ -3,16 +3,16 @@ # @@ -21,8 +21,8 @@ Index: walinuxagent-2.2.21/config/waagent.conf +Provisioning.RegenerateSshHostKeyPair=n # Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto". - # The "auto" option is supported on OpenSSH 5.9 (2011) and later. -@@ -37,14 +37,14 @@ Provisioning.ExecuteCustomData=n + Provisioning.SshHostKeyPairType=rsa +@@ -36,14 +36,14 @@ Provisioning.ExecuteCustomData=n Provisioning.AllowResetSysUser=n # Format if unformatted. If 'n', resource disk will not be mounted. -- cgit v1.2.3