diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2017-01-16 10:10:41 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2017-01-17 17:53:13 +0000 |
| commit | dd73af563850762aad64e7ed2a9897377830af10 (patch) | |
| tree | 33f34ccce29a5a11227741dbe6a8fce20deeeaba /debian/patches/disable_import_test.patch | |
| parent | a05019d9343d0fde153d75a8e61fb6f99d1d3ff3 (diff) | |
| parent | 558111e33720eb8f1eaacf571cf4fadae2430286 (diff) | |
| download | vyos-walinuxagent-dd73af563850762aad64e7ed2a9897377830af10.tar.gz vyos-walinuxagent-dd73af563850762aad64e7ed2a9897377830af10.zip | |
Import patches-applied version 2.2.2-0ubuntu1 to applied/ubuntu/zesty-proposed
Imported using git-ubuntu import.
Changelog parent: a05019d9343d0fde153d75a8e61fb6f99d1d3ff3
Unapplied parent: 558111e33720eb8f1eaacf571cf4fadae2430286
New changelog entries:
* New upstream release (LP: #1651128)
- d/patches/fix-auto-update.patch,
d/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch:
- Dropped as changes have been applied upstream
- Refreshed debian/patches/disable_import_test.patch
Diffstat (limited to 'debian/patches/disable_import_test.patch')
| -rw-r--r-- | debian/patches/disable_import_test.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/debian/patches/disable_import_test.patch b/debian/patches/disable_import_test.patch index cf3d167..14c0746 100644 --- a/debian/patches/disable_import_test.patch +++ b/debian/patches/disable_import_test.patch @@ -1,7 +1,9 @@ ---- a/config/waagent.conf -+++ b/config/waagent.conf -@@ -14,13 +14,13 @@ - Role.TopologyConsumer=None +Index: walinuxagent-2.2.2/config/waagent.conf +=================================================================== +--- walinuxagent-2.2.2.orig/config/waagent.conf ++++ walinuxagent-2.2.2/config/waagent.conf +@@ -3,13 +3,13 @@ + # # Enable instance creation -Provisioning.Enabled=y @@ -17,7 +19,7 @@ # Supported values are "rsa", "dsa" and "ecdsa". Provisioning.SshHostKeyPairType=rsa -@@ -44,14 +44,14 @@ +@@ -33,14 +33,14 @@ Provisioning.ExecuteCustomData=n Provisioning.AllowResetSysUser=n # Format if unformatted. If 'n', resource disk will not be mounted. |