diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2016-11-12 07:54:22 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2016-11-12 07:54:22 +0000 |
commit | 7615d7894519e1afd313b03976643eec73a779c9 (patch) | |
tree | 835acf822c6dd0baef468ab3a6d9c2b116930e75 /lib/container/list | |
parent | Releasing debian version 20161105-1. (diff) | |
download | open-infrastructure-compute-tools-7615d7894519e1afd313b03976643eec73a779c9.tar.xz open-infrastructure-compute-tools-7615d7894519e1afd313b03976643eec73a779c9.zip |
Merging upstream version 20161112.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rwxr-xr-x | lib/container/list | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/container/list b/lib/container/list index e5e76fe..04e9f0f 100755 --- a/lib/container/list +++ b/lib/container/list @@ -183,9 +183,14 @@ do ;; esac + ADDRESSES="" + if ls "${MACHINES}/${CONTAINER}/etc/systemd/network"/*.network > /dev/null 2>&1 then ADDRESSES="$(awk -F= '/Address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/systemd/network/*.network)" + elif [ -e "${MACHINES}/${CONTAINER}/etc/network/interfaces" ] + then + ADDRESSES="$(awk '/address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/network/interfaces)" fi ADDRESSES="${ADDRESSES:-n/a}" |