diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-28 12:27:13 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-28 12:27:13 -0400 |
| commit | e27555769d9e432f1a5b3dfbd91a6fea51ddf435 (patch) | |
| tree | 43ac0c3e84072196fe1532d421f28f5e0b10b2c9 | |
| parent | 2875befa1404ee64eb95d72609617556a69ca6e7 (diff) | |
| download | cloud-init-git-e27555769d9e432f1a5b3dfbd91a6fea51ddf435.tar.gz | |
Import version 0.7.8-1-g3705bb5-0ubuntu1~16.04.2ubuntu/0.7.8-1-g3705bb5-0ubuntu1_16.04.2ubuntu/0.7.8-1-g3705bb5-0ubuntu1.16.04.2
Imported using git-dsc-commit.
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/ipv6-config | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 37 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 50a8cb80..7d74a169 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cloud-init (0.7.8-1-g3705bb5-0ubuntu1~16.04.2) xenial; urgency=medium + + * Support IPv6 config coming from initramfs. LP: #1621615. + + -- LaMont Jones <lamont@ubuntu.com> Fri, 23 Sep 2016 20:54:40 -0600 + cloud-init (0.7.8-1-g3705bb5-0ubuntu1~16.04.1) xenial-proposed; urgency=medium * New upstream release 0.7.8. diff --git a/debian/patches/ipv6-config b/debian/patches/ipv6-config new file mode 100644 index 00000000..b6303e04 --- /dev/null +++ b/debian/patches/ipv6-config @@ -0,0 +1,30 @@ +--- 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'): diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..c486f303 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +ipv6-config |