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:22:38 +0000 |
commit | b8fb732113a64bdb71fcc367d076717885ad0595 (patch) | |
tree | 9629daa3fa9c17558c90aafd050a05c1a1e8cea0 /lib/container | |
parent | Updating irc notification handling for new upstream where the notification is... (diff) | |
download | open-infrastructure-compute-tools-b8fb732113a64bdb71fcc367d076717885ad0595.tar.xz open-infrastructure-compute-tools-b8fb732113a64bdb71fcc367d076717885ad0595.zip |
Merging upstream version 20161220.tmp-hooks
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 |