From 80bbc251566e653d70a4fea45133b61edfda784c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 21 Dec 2016 10:22:28 +0100 Subject: Adding upstream version 20161220. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 8 ++++++++ VERSION.txt | 2 +- lib/container/list | 14 +++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0fd720b..8b1712f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,11 @@ +2016-12-20 Daniel Baumann + + * Releasing version 20161220. + + [ Daniel Baumann ] + * Fixing suffix in nwdiag output in container list command. + * Handling unreadable container directory properly in container list command. + 2016-12-10 Daniel Baumann * Releasing version 20161210. diff --git a/VERSION.txt b/VERSION.txt index d407b1f..162675c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20161210 +20161220 diff --git a/lib/container/list b/lib/container/list index f9f46fb..da8a158 100755 --- a/lib/container/list +++ b/lib/container/list @@ -318,7 +318,10 @@ EOF ;; esac -CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 -type d -and -not -name '.container-tools' -and -not -name 'container-tools' -and -not -name 'lost+found' -and -not -name '.snap' -and -not -name '.snapshot' -printf '%P\n' | sort)" +if ls "${MACHINES}"/* > /dev/null 2>&1 +then + CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 -type d -and -not -name '.container-tools' -and -not -name 'container-tools' -and -not -name 'lost+found' -and -not -name '.snap' -and -not -name '.snapshot' -printf '%P\n' | sort)" +fi for CONTAINER in ${CONTAINERS} do @@ -401,6 +404,15 @@ EOF cat << EOF ], } +EOF + + ;; + + nwdiag) + +cat << EOF + } +} EOF ;; -- cgit v1.2.3