Package: release.debian.org Severity: normal Tags: buster User: release.debian....@packages.debian.org Usertags: pu
Hi, unfortunatlly I did a rebase error when preparing the upload for buster, so one necessary 'case' statement got removed that shouldn't. The effect of the missing 'case' statement is that when containers are started, they will be automatically shutdown after the systemd unit timeout is reached when calling 'systemd-nspawn --keep-unit [...]' the second time (which should be only called once, the second time the script is executed it should be noop for systemd-nspawn). Since I'm upstream for this, I've released a new version and attached the full diff (upstream+debian). Thanks, Daniel
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.baum...@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 <n...@netstyle.ch>. + 2019-03-02 Daniel Baumann <daniel.baum...@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/debian/changelog b/debian/changelog index 2845317..3f3d26c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +open-infrastructure-compute-tools (20190301-lts2-1~deb10u1) buster; urgency=medium + + * Uploading to buster. + * Merging upstream version 20190301-lts2: + - Restoring case statement that got lost when excluding limit container + command for buster to fix container start, thanks to Nik Lutz + <n...@netstyle.ch>. + + -- Daniel Baumann <daniel.baum...@progress-linux.org> Tue, 13 Aug 2019 00:47:36 +0200 + open-infrastructure-compute-tools (20190301-lts1-2) unstable; urgency=medium * Uploading to sid. 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}"