From 213313c109c5551473da36a85ceb56bdf1162628 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 4 Nov 2019 07:06:29 +0100 Subject: Merging upstream version 20191104. Signed-off-by: Daniel Baumann --- lib/container/list | 2 +- lib/container/start | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/container/list b/lib/container/list index 6b0d771..5427c90 100755 --- a/lib/container/list +++ b/lib/container/list @@ -367,7 +367,7 @@ do if ls "${MACHINES}/${CONTAINER}/etc/systemd/network"/*.network > /dev/null 2>&1 then - ADDRESS="$(awk -F= '/Address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/systemd/network/*.network | head -n1)" + ADDRESS="$(awk -F= '/^Address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/systemd/network/*.network | head -n1)" elif [ -e "${MACHINES}/${CONTAINER}/etc/network/interfaces" ] then ADDRESS="$(awk '/address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/network/interfaces | head -n1)" diff --git a/lib/container/start b/lib/container/start index 47c2907..13fc6ef 100755 --- a/lib/container/start +++ b/lib/container/start @@ -101,6 +101,9 @@ then Usage fi +# hooks +export NAME + case "${NAME}" in ALL) NAMES="$(${PROGRAM} list --format shell --stopped)" -- cgit v1.2.3