Viewing all changes in revision 819.
- Committer: Tarmac
- Date: 2015-05-08 11:38:08 UTC
- mfrom: (817.1.2 fix-vivid-lxc-detection)
- Revision ID: tarmac-20150508113808-ou7qxu5sj0eweq9z
Merge fix-vivid-lxc-detection [f=1449920] [r=tealeg,fcorrea] [a=Alberto Donato]
This fixes container detection on Vivid hosts.
With the switch to systemd, the /run/container_type is no longer created (unless init-system-helpers is installed), so container detection fails.
The same information is also available in /run/systemd/container, so the branch also checks for that file.
This fixes container detection on Vivid hosts.
With the switch to systemd, the /run/container_type is no longer created (unless init-system-helpers is installed), so container detection fails.
The same information is also available in /run/systemd/container, so the branch also checks for that file.
- files modified:
- landscape/lib/tests/test_vm_info.py
expand all
collapse all
added
removed
