Skip to content

L
lxc
Commit f4031540 by Dwight Engen Committed by Stéphane Graber
Options

legacy ls: only output appropriate directories/containers

For lxc-ls without --active, only output a directory in lxc_path if it contains a file named config. This avoids extra directories that may exist in lxc_path, for example .snapshot if lxc_path is an nfs mount. For lxc-ls with --active, don't output . if there are no active containers. Signed-off-by: 's avatarDwight Engen <dwight.engen@oracle.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent d42277f7
Showing with 8 additions and 1 deletion
src/lxc/legacy/lxc-ls.in
......@@ -85,7 +85,14 @@ done
containers=""
if [ ! -z "$directory" ]; then
containers=$(find $directory -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sed 's:.*/::')
if [ x"$parent_cgroup" = x ]; then
containers=$(find $directory -mindepth 2 -maxdepth 2 -name config -type f |awk -F "/" '{print $(NF-1)}')
else
containers=$(find $directory -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sed 's:.*/::')
fi
if [ x"$containers" = x ]; then
exit 0
fi
fi
cd "$directory"
......
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