diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2018-02-15 14:28:59 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2018-02-15 19:08:29 +0000 |
| commit | 3afbcfff2f6e3faf50c0dffee55e7c48b50755b5 (patch) | |
| tree | 44d4a5d80868fe6a8defe57f6cc9c21feae59a03 /debian/patches/disable_import_test.patch | |
| parent | 6c9cd7e1ac55aae259d8e2f06569375e27a12f20 (diff) | |
| parent | 7e7d885433a2bac56ce2361126bf7ec3d565fd66 (diff) | |
| download | vyos-walinuxagent-3afbcfff2f6e3faf50c0dffee55e7c48b50755b5.tar.gz vyos-walinuxagent-3afbcfff2f6e3faf50c0dffee55e7c48b50755b5.zip | |
Import patches-applied version 2.2.21+really2.2.20-0ubuntu1~16.04.1 to applied/ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: 6c9cd7e1ac55aae259d8e2f06569375e27a12f20
Unapplied parent: 7e7d885433a2bac56ce2361126bf7ec3d565fd66
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.
Diffstat (limited to 'debian/patches/disable_import_test.patch')
| -rw-r--r-- | debian/patches/disable_import_test.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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. |