diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-11-04 06:06:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-11-04 06:07:41 +0000 |
| commit | 213313c109c5551473da36a85ceb56bdf1162628 (patch) | |
| tree | 36b6bef13e2080d6af1c5a6fa4ed4ceb118ff742 | |
| parent | Releasing debian version 20190811-1. (diff) | |
| download | open-infrastructure-compute-tools-213313c109c5551473da36a85ceb56bdf1162628.tar.xz open-infrastructure-compute-tools-213313c109c5551473da36a85ceb56bdf1162628.zip | |
Merging upstream version 20191104.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | CHANGELOG.txt | 8 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rwxr-xr-x | lib/container/list | 2 | ||||
| -rwxr-xr-x | lib/container/start | 3 | ||||
| -rw-r--r-- | share/hooks/pre-start.unlink-console.sh | 8 |
5 files changed, 21 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fc80047..8764b8c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,11 @@ +2019-11-04 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20191104. + + [ Daniel Baumann ] + * Adding default hook to unlink console prior start when bindmounting /dev (e.g. in GPU computing cases). + * Tightening Address lookup in container list command for systemd-networkd to not display MACAdresses instead of IPs. + 2019-08-11 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20190811. diff --git a/VERSION.txt b/VERSION.txt index 8507a47..6bd7a98 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20190811 +20191104 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)" diff --git a/share/hooks/pre-start.unlink-console.sh b/share/hooks/pre-start.unlink-console.sh new file mode 100644 index 0000000..762ab0e --- /dev/null +++ b/share/hooks/pre-start.unlink-console.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +if grep -qs 'bind=.*/dev:/dev;' "/etc/open-infrastructure/container/config/${NAME}.conf" +then + unlink /dev/console > /dev/null 2>&1 || true +fi |