diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-04 10:38:15 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-04 10:38:15 -0400 |
| commit | 223e50f51e281e716b2b289c2c9b772c3eaeb563 (patch) | |
| tree | 0020c78b04aee768cdc6cb25438e7a48c7d1887e /cloudinit/net/cmdline.py | |
| parent | 81c821916d18efeee4339ed326c6d9a5a3d136e9 (diff) | |
| parent | a1cdebdea65ccd827060c823146992bba9debe19 (diff) | |
| download | vyos-cloud-init-223e50f51e281e716b2b289c2c9b772c3eaeb563.tar.gz vyos-cloud-init-223e50f51e281e716b2b289c2c9b772c3eaeb563.zip | |
merge from master at 0.7.8-34-ga1cdebd
Diffstat (limited to 'cloudinit/net/cmdline.py')
| -rw-r--r-- | cloudinit/net/cmdline.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py index 933317d5..4075a279 100644 --- a/cloudinit/net/cmdline.py +++ b/cloudinit/net/cmdline.py @@ -76,12 +76,13 @@ def _klibc_to_config_entry(content, mac_addrs=None): data = _load_shell_content(content) try: - name = data['DEVICE'] + name = data['DEVICE'] if 'DEVICE' in data else data['DEVICE6'] except KeyError: - raise ValueError("no 'DEVICE' entry in data") + raise ValueError("no 'DEVICE' or 'DEVICE6' entry in data") # ipconfig on precise does not write PROTO - proto = data.get('PROTO') + # IPv6 config gives us IPV6PROTO, not PROTO. + proto = data.get('PROTO', data.get('IPV6PROTO')) if not proto: if data.get('filename'): proto = 'dhcp' |