diff options
| author | Scott Moser <smoser@brickies.net> | 2017-06-15 10:03:45 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-06-15 17:10:54 -0400 |
| commit | ecb408afa1104fe49ce6eb1dc5708be56abd5cb2 (patch) | |
| tree | 8d1161c2f44f07aec73348fa6d2c8a14701d7dd6 /cloudinit/config/cc_power_state_change.py | |
| parent | 9ccb8f5e2ab262ee04bb9c103c1302479f7c81d3 (diff) | |
| download | vyos-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_power_state_change.py')
| -rw-r--r-- | cloudinit/config/cc_power_state_change.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_power_state_change.py b/cloudinit/config/cc_power_state_change.py index c1c6fe7e..eba58b02 100644 --- a/cloudinit/config/cc_power_state_change.py +++ b/cloudinit/config/cc_power_state_change.py @@ -71,7 +71,7 @@ def givecmdline(pid): # Example output from procstat -c 1 # PID COMM ARGS # 1 init /bin/init -- - if util.system_info()["platform"].startswith('FreeBSD'): + if util.is_FreeBSD(): (output, _err) = util.subp(['procstat', '-c', str(pid)]) line = output.splitlines()[1] m = re.search('\d+ (\w|\.|-)+\s+(/\w.+)', line) |