diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2016-12-21 09:22:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2016-12-21 09:23:02 +0000 |
| commit | c8d4fe0d93153c5cecab2cfaea9493b3851dd185 (patch) | |
| tree | 436e8e9b30c688955614565215e612df0ac76221 /lib/container | |
| parent | Releasing debian version 20161210-1. (diff) | |
| download | open-infrastructure-compute-tools-c8d4fe0d93153c5cecab2cfaea9493b3851dd185.tar.xz open-infrastructure-compute-tools-c8d4fe0d93153c5cecab2cfaea9493b3851dd185.zip | |
Merging upstream version 20161220.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'lib/container')
| -rwxr-xr-x | lib/container/list | 14 |
1 files changed, 13 insertions, 1 deletions
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 @@ -405,6 +408,15 @@ EOF ;; + nwdiag) + +cat << EOF + } +} +EOF + + ;; + xml) cat << EOF |