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 | bdfe3a4fa9bd487ec5f40e829742e127476d2c8a (patch) | |
| tree | 947ecb04d5e2737883803034ab9885ddab70b816 /debian/patches | |
| parent | 6aaeb3237653102b5a376986f0ea73327a7a4379 (diff) | |
| download | vyos-walinuxagent-bdfe3a4fa9bd487ec5f40e829742e127476d2c8a.tar.gz vyos-walinuxagent-bdfe3a4fa9bd487ec5f40e829742e127476d2c8a.zip | |
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.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/disable_import_test.patch | 10 |
1 files changed, 6 insertions, 4 deletions
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. |