Skip to content

L
lxc
Unverified Commit 52b0a7d9 by Stéphane Graber
Options

lxc-ls: Cache groups and show bygroup in autostart

This makes sure we only query lxc.group once and then reuse that list for filtering, listing groups and autostart. When a container is auto-started only as part of a group, autostart will now show by-group instead of yes. Signed-off-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 4724cf84
Showing with 13 additions and 10 deletions
src/lxc/lxc-ls.in
......@@ -235,11 +235,15 @@ def get_containers(fd=None, base="/", root=False):
except:
continue
if args.groups:
if args.groups or "autostart" in args.fancy_format \
or "groups" in args.fancy_format:
try:
set_has = set(container.get_config_item("lxc.group"))
groups = container.get_config_item("lxc.group")
except KeyError:
set_has = set()
groups = []
if args.groups:
set_has = set(groups)
for group in args.groups:
set_must = set(group.split(","))
......@@ -275,18 +279,17 @@ def get_containers(fd=None, base="/", root=False):
if 'groups' in args.fancy_format:
entry['groups'] = "-"
try:
groups = container.get_config_item("lxc.group")
if len(groups) > 0:
entry['groups'] = ", ".join(groups)
except KeyError:
pass
if len(groups) > 0:
entry['groups'] = ", ".join(groups)
if 'autostart' in args.fancy_format:
entry['autostart'] = "NO"
try:
if container.get_config_item("lxc.start.auto") == "1":
entry['autostart'] = "YES"
if len(groups) > 0:
entry['autostart'] = "BY-GROUP"
else:
entry['autostart'] = "YES"
except KeyError:
pass
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment