diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-08-12 22:47:11 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-08-12 22:47:16 +0000 |
| commit | f64c048f0da35c1bdd124688360549f7544406a9 (patch) | |
| tree | 11fa3ad1f4b70fc1ded1ab92d6bbbc85abf3dd1c | |
| parent | Releasing debian version 20190301-lts1-2. (diff) | |
| download | open-infrastructure-compute-tools-f64c048f0da35c1bdd124688360549f7544406a9.tar.xz open-infrastructure-compute-tools-f64c048f0da35c1bdd124688360549f7544406a9.zip | |
Merging upstream version 20190301-lts2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | CHANGELOG.txt | 7 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rwxr-xr-x | lib/container/start | 11 |
3 files changed, 17 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 330e383..251daf1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,10 @@ +2019-08-13 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20190301-lts2. + + [ Daniel Baumann ] + * Restoring case statement that got lost when excluding limit container command for buster to fix container start, thanks to Nik Lutz <nik@netstyle.ch>. + 2019-03-02 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20190301-lts1. diff --git a/VERSION.txt b/VERSION.txt index 7182ca9..0583a76 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20190301-lts1 +20190301-lts2 diff --git a/lib/container/start b/lib/container/start index 82f9314..e1a5fb6 100755 --- a/lib/container/start +++ b/lib/container/start @@ -408,8 +408,15 @@ case "${SYSTEMCTL}" in ;; esac -# Run -${SETARCH} systemd-nspawn --keep-unit ${BIND} ${BIND_RO} ${BOOT} ${CAPABILITY} ${DIRECTORY} ${DROP_CAPABILITY} ${MACHINE} ${NETWORK_VETH_EXTRA} ${LINK_JOURNAL} ${REGISTER} +case "${START}" in + true) + ;; + + *) + # Run + ${SETARCH} systemd-nspawn --keep-unit ${BIND} ${BIND_RO} ${BOOT} ${CAPABILITY} ${DIRECTORY} ${DROP_CAPABILITY} ${MACHINE} ${NETWORK_VETH_EXTRA} ${LINK_JOURNAL} ${REGISTER} + ;; +esac # Post hooks for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}" |