From bdfe3a4fa9bd487ec5f40e829742e127476d2c8a Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Mon, 5 Feb 2018 17:25:14 +0100 Subject: Import patches-unapplied version 2.2.21-0ubuntu1 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 6aaeb3237653102b5a376986f0ea73327a7a4379 New changelog entries: * New upstream release (LP: #1746628). * debian/patches/disable_import_test.patch: refreshed patch. --- debian/changelog | 7 +++++++ debian/patches/disable_import_test.patch | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2d70dc5..c9c0460 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +walinuxagent (2.2.21-0ubuntu1) bionic; urgency=medium + + * New upstream release (LP: #1746628). + * debian/patches/disable_import_test.patch: refreshed patch. + + -- Łukasz 'sil2100' Zemczak Mon, 05 Feb 2018 17:25:14 +0100 + walinuxagent (2.2.17-0ubuntu1) artful; urgency=medium * New upstream release (LP: #1717306). diff --git a/debian/patches/disable_import_test.patch b/debian/patches/disable_import_test.patch index f51d77e..e6b4bdb 100644 --- a/debian/patches/disable_import_test.patch +++ b/debian/patches/disable_import_test.patch @@ -1,5 +1,7 @@ ---- a/config/waagent.conf -+++ b/config/waagent.conf +Index: walinuxagent-2.2.21/config/waagent.conf +=================================================================== +--- walinuxagent-2.2.21.orig/config/waagent.conf ++++ walinuxagent-2.2.21/config/waagent.conf @@ -3,16 +3,16 @@ # @@ -19,8 +21,8 @@ +Provisioning.RegenerateSshHostKeyPair=n # Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto". - Provisioning.SshHostKeyPairType=rsa -@@ -36,14 +36,14 @@ + # The "auto" option is supported on OpenSSH 5.9 (2011) and later. +@@ -37,14 +37,14 @@ Provisioning.ExecuteCustomData=n Provisioning.AllowResetSysUser=n # Format if unformatted. If 'n', resource disk will not be mounted. -- cgit v1.2.3