summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_growpart.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-06-15 10:03:45 -0400
committerScott Moser <smoser@brickies.net>2017-06-15 17:10:54 -0400
commitecb408afa1104fe49ce6eb1dc5708be56abd5cb2 (patch)
tree8d1161c2f44f07aec73348fa6d2c8a14701d7dd6 /cloudinit/config/cc_growpart.py
parent9ccb8f5e2ab262ee04bb9c103c1302479f7c81d3 (diff)
downloadvyos-cloud-init-ecb408afa1104fe49ce6eb1dc5708be56abd5cb2.tar.gz
vyos-cloud-init-ecb408afa1104fe49ce6eb1dc5708be56abd5cb2.zip
FreeBSD: Make freebsd a variant, fix unittests and tools/build-on-freebsd.
- Simplify the logic of 'variant' in util.system_info much of the data from https://github.com/hpcugent/easybuild/wiki/OS_flavor_name_version - fix get_resource_disk_on_freebsd when running on a system without an Azure resource disk. - fix tools/build-on-freebsd to replace oauth with oauthlib and add bash which is a dependency for tests. - update a fiew places that were checking for freebsd but not using the util.is_FreeBSD()
Diffstat (limited to 'cloudinit/config/cc_growpart.py')
-rw-r--r--cloudinit/config/cc_growpart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py
index d2bc6e6c..bafca9d8 100644
--- a/cloudinit/config/cc_growpart.py
+++ b/cloudinit/config/cc_growpart.py
@@ -214,7 +214,7 @@ def device_part_info(devpath):
# FreeBSD doesn't know of sysfs so just get everything we need from
# the device, like /dev/vtbd0p2.
- if util.system_info()["platform"].startswith('FreeBSD'):
+ if util.is_FreeBSD():
m = re.search('^(/dev/.+)p([0-9])$', devpath)
return (m.group(1), m.group(2))