diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-04 13:25:00 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-04 13:25:00 -0400 |
| commit | 882b22e024733e17757fdbe36ba2a3672c6ebe06 (patch) | |
| tree | 503fc4abb77c5d9516ca38bdf6722ab759324923 /debian/patches/ipv6-config | |
| parent | 8c7f3acb8c8180fba5e350aeed4f476e79e464ff (diff) | |
| download | vyos-cloud-init-882b22e024733e17757fdbe36ba2a3672c6ebe06.tar.gz vyos-cloud-init-882b22e024733e17757fdbe36ba2a3672c6ebe06.zip | |
remove debian/patches in anticipation of new snapshot
Drop:
debian/patches/ipv6-config
debian/patches/ntp-move-to-run-after-apt-configuration.patch
Remove the now-empty unnecesary:
debian/patches/series
Diffstat (limited to 'debian/patches/ipv6-config')
| -rw-r--r-- | debian/patches/ipv6-config | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/debian/patches/ipv6-config b/debian/patches/ipv6-config deleted file mode 100644 index b6303e04..00000000 --- a/debian/patches/ipv6-config +++ /dev/null @@ -1,30 +0,0 @@ ---- a/cloudinit/net/cmdline.py -+++ b/cloudinit/net/cmdline.py -@@ -86,7 +86,7 @@ - else: - proto = 'static' - -- if proto not in ('static', 'dhcp'): -+ if proto not in ('static', 'dhcp', 'dhcp6'): - raise ValueError("Unexpected value for PROTO: %s" % proto) - - iface = { -@@ -98,12 +98,15 @@ - if name in mac_addrs: - iface['mac_address'] = mac_addrs[name] - -- # originally believed there might be IPV6* values -- for v, pre in (('ipv4', 'IPV4'),): -+ # Handle both IPv4 and IPv6 values -+ for v, pre in (('ipv4', 'IPV4'), ('ipv6', 'IPV6')): - # if no IPV4ADDR or IPV6ADDR, then go on. - if pre + "ADDR" not in data: - continue -- subnet = {'type': proto, 'control': 'manual'} -+ if pre + "PROTO" in data: -+ subnet = {'type': data[pre + 'PROTO'], 'control': 'manual'} -+ else: -+ subnet = {'type': proto, 'control': 'manual'} - - # these fields go right on the subnet - for key in ('NETMASK', 'BROADCAST', 'GATEWAY'): |