summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorConrad Hoffmann <conrad@soundcloud.com>2019-10-01 20:43:29 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-10-01 20:43:29 +0000
commit5d5a32e039782ce3e1c0843082fe26260fa9273a (patch)
treefe4aeb1469e51499a1a9f2164cb27aad11ba423e /cloudinit
parent067516d7bc917e4921b9f1424b7a64e92cae0ad2 (diff)
downloadvyos-cloud-init-5d5a32e039782ce3e1c0843082fe26260fa9273a.tar.gz
vyos-cloud-init-5d5a32e039782ce3e1c0843082fe26260fa9273a.zip
Add support for Arch Linux in render-cloudcfg
 - Detect Arch Linux and set variant accordingly in `system_info()`  - Allow setting render-cloudcfg variant parameter to 'arch'  - Adjust some basic settings for Arch Linux in the cloud.cfg.tmpl The template might need some additional Arch-specific tweaks in the future, but at least for now the generated config works and contains the most relevant modules. Also: - Sort distro variant lists when adding Arch - Add debian to known variants in render-cloudcfg
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 6e8e73b0..0d338ca7 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -656,7 +656,8 @@ def system_info():
var = 'unknown'
if system == "linux":
linux_dist = info['dist'][0].lower()
- if linux_dist in ('centos', 'debian', 'fedora', 'rhel', 'suse'):
+ if linux_dist in (
+ 'arch', 'centos', 'debian', 'fedora', 'rhel', 'suse'):
var = linux_dist
elif linux_dist in ('ubuntu', 'linuxmint', 'mint'):
var = 'ubuntu'