summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2016-12-21 09:22:36 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2016-12-21 09:23:02 +0000
commitc8d4fe0d93153c5cecab2cfaea9493b3851dd185 (patch)
tree436e8e9b30c688955614565215e612df0ac76221
parentReleasing debian version 20161210-1. (diff)
downloadopen-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>
-rw-r--r--CHANGELOG.txt8
-rw-r--r--VERSION.txt2
-rwxr-xr-xlib/container/list14
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 <daniel.baumann@open-infrastructure.net>
+
+ * 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 <daniel.baumann@open-infrastructure.net>
* 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
@@ -405,6 +408,15 @@ EOF
;;
+ nwdiag)
+
+cat << EOF
+ }
+}
+EOF
+
+ ;;
+
xml)
cat << EOF