diff options
| author | Scott Moser <smoser@ubuntu.com> | 2018-08-23 23:41:40 -0700 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2018-08-23 23:41:41 -0700 |
| commit | 3c88359cddb739b77f55a96e24a34f250d230cdc (patch) | |
| tree | cb421c08f27aaa78091a70e45bf9af6d573c2787 /debian | |
| parent | bc6a51184c2050b72a1b1a66e811a383b110332e (diff) | |
| download | vyos-cloud-init-3c88359cddb739b77f55a96e24a34f250d230cdc.tar.gz vyos-cloud-init-3c88359cddb739b77f55a96e24a34f250d230cdc.zip | |
refresh patches against master commit dab59087
refresh patches against master commit dab59087:
debian/patches/azure-use-walinux-agent.patch
debian/patches/openstack-no-network-config.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/azure-use-walinux-agent.patch | 4 | ||||
| -rw-r--r-- | debian/patches/openstack-no-network-config.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/azure-use-walinux-agent.patch b/debian/patches/azure-use-walinux-agent.patch index 0caa44e0..3c858824 100644 --- a/debian/patches/azure-use-walinux-agent.patch +++ b/debian/patches/azure-use-walinux-agent.patch @@ -6,12 +6,12 @@ Forwarded: not-needed Author: Scott Moser <smoser@ubuntu.com> --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py -@@ -184,7 +184,7 @@ if util.is_FreeBSD(): +@@ -196,7 +196,7 @@ if util.is_FreeBSD(): LOG.debug("resource disk is None") BUILTIN_DS_CONFIG = { - 'agent_command': AGENT_START_BUILTIN, + 'agent_command': AGENT_START, - 'data_dir': "/var/lib/waagent", + 'data_dir': AGENT_SEED_DIR, 'set_hostname': True, 'hostname_bounce': { diff --git a/debian/patches/openstack-no-network-config.patch b/debian/patches/openstack-no-network-config.patch index d6560f4e..88449d1d 100644 --- a/debian/patches/openstack-no-network-config.patch +++ b/debian/patches/openstack-no-network-config.patch @@ -15,7 +15,7 @@ Author: Chad Smith <chad.smith@canonical.com> --- a/cloudinit/sources/DataSourceOpenStack.py +++ b/cloudinit/sources/DataSourceOpenStack.py -@@ -97,10 +97,9 @@ class DataSourceOpenStack(openstack.Sour +@@ -98,10 +98,9 @@ class DataSourceOpenStack(openstack.Sour if self._network_config != sources.UNSET: return self._network_config |