diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2018-02-05 17:25:14 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2018-02-05 19:15:55 +0000 |
| commit | 6c9cd7e1ac55aae259d8e2f06569375e27a12f20 (patch) | |
| tree | 335726f611f1ed30aef7d82ff0e2bae0a91ff44b /debian | |
| parent | 110d301b04a64d680fc7d102424e303a8e3ca1a6 (diff) | |
| parent | d5298bbf0f5696fc948877304e86f43d477d6b71 (diff) | |
| download | vyos-walinuxagent-6c9cd7e1ac55aae259d8e2f06569375e27a12f20.tar.gz vyos-walinuxagent-6c9cd7e1ac55aae259d8e2f06569375e27a12f20.zip | |
Import patches-applied version 2.2.21-0ubuntu1 to applied/ubuntu/bionic-proposed
Imported using git-ubuntu import.
Changelog parent: 110d301b04a64d680fc7d102424e303a8e3ca1a6
Unapplied parent: d5298bbf0f5696fc948877304e86f43d477d6b71
New changelog entries:
* New upstream release (LP: #1746628).
* debian/patches/disable_import_test.patch: refreshed patch.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/disable_import_test.patch | 10 |
2 files changed, 13 insertions, 4 deletions
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 <lukasz.zemczak@ubuntu.com> 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. |