diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-06-29 09:14:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-06-29 09:21:06 +0000 |
| commit | 6200fe310bc923404bf943a87f0fc75db054f2aa (patch) | |
| tree | bca0304926ed0fd00c634db26c5641308a5b0fff /lib/container/list | |
| parent | Releasing debian version 20170522-1. (diff) | |
| download | open-infrastructure-compute-tools-6200fe310bc923404bf943a87f0fc75db054f2aa.tar.xz open-infrastructure-compute-tools-6200fe310bc923404bf943a87f0fc75db054f2aa.zip | |
Merging upstream version 20170629.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container/list')
| -rwxr-xr-x | lib/container/list | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/container/list b/lib/container/list index 9bf61c4..cd88475 100755 --- a/lib/container/list +++ b/lib/container/list @@ -130,7 +130,7 @@ List () { case "${FORMAT}" in cli) - printf "%-80s %-29s\n" "${STATUS} ${BLUE}${CONTAINER}${NORMAL}" "${YELLOW}${ADDRESS}${NORMAL}" + printf "%1s %-74s %-19s\n" "${STATUS}" "${BLUE}${CONTAINER}${NORMAL}" "${YELLOW}${ADDRESS}${NORMAL}" ;; csv) @@ -222,7 +222,7 @@ case "${FORMAT}" in NORMAL="$(tput sgr0)" cat << EOF -${WHITE} ${NORMAL} Container IPv4 Address(es) +${WHITE} ${NORMAL} Container IPv4 Address(es) -------------------------------------------------------------------------------- EOF @@ -329,10 +329,10 @@ do if [ -e "${CONFIG}/${CONTAINER}.conf" ] then - AUTO="$(awk -F= '/^cnt.auto=/ { print $2 }' ${CONFIG}/${CONTAINER}.conf)" - AUTO="${AUTO:-false}" + CONTAINER_SERVER="$(awk -F= '/^cnt.container-server=/ { print $2 }' ${CONFIG}/${CONTAINER}.conf)" + CONTAINER_SERVER="${CONTAINER_SERVER:-false}" - case "${AUTO}" in + case "${CONTAINER_SERVER}" in ${HOST}|true) ;; @@ -347,7 +347,7 @@ do case "${STATE}" in running) STATE="started" - STATUS="${GREEN}✔${NORMAL}" + STATUS="${GREEN}●${NORMAL}" ;; other) @@ -356,7 +356,7 @@ do *) STATE="stopped" - STATUS="${RED}✘${NORMAL}" + STATUS="${RED}●${NORMAL}" ;; esac |