summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-12-11 13:14:35 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-12-11 13:16:11 +0000
commit5a1b96cdcc211f51dc64762097e7f8e0c534e2a9 (patch)
tree23dddb62f3927a9b67a9a862679b50f02b4dfb1d
parentAdding trailing line in full format for container list command. (diff)
downloadcompute-tools-5a1b96cdcc211f51dc64762097e7f8e0c534e2a9.tar.xz
compute-tools-5a1b96cdcc211f51dc64762097e7f8e0c534e2a9.zip
Removing half-finished multi-address handling in container list command.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xlib/container/list20
1 files changed, 3 insertions, 17 deletions
diff --git a/lib/container/list b/lib/container/list
index 0d9c9ed..9b93173 100755
--- a/lib/container/list
+++ b/lib/container/list
@@ -125,21 +125,7 @@ Show ()
;;
full)
- FIRST_LINE="true"
-
- for ADDRESS in ${ADDRESSES}
- do
- case "${FIRST_LINE}" in
- true)
- FIRST_LINE="false"
- printf "%-80s %-29s\n" "${STATUS} ${BLUE}${CONTAINER}${NORMAL}" "${YELLOW}${ADDRESS}${NORMAL}"
- ;;
-
- *)
- printf "%-80s %-29s\n" "" "${ADDRESS}"
- ;;
- esac
- done
+ printf "%-80s %-29s\n" "${STATUS} ${BLUE}${CONTAINER}${NORMAL}" "${YELLOW}${ADDRESS}${NORMAL}"
;;
esac
}
@@ -187,10 +173,10 @@ do
if [ -e "${MACHINES}/${CONTAINER}/etc/network/interfaces" ]
then
- ADDRESSES="$(awk '/address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/network/interfaces)"
+ ADDRESS="$(awk '/address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/network/interfaces | head -n1)"
fi
- ADDRESSES="${ADDRESSES:-n/a}"
+ ADDRESS="${ADDRESS:-n/a}"
if echo ${LIST} | grep -qs all
then