commit f0c91651dd21cdf1a1dbed2f341dfdfe16ad8c0d parent c5211028134b392558802279cba0f035e4f20391 Author: ccx <ccx@te2000.cz> Date: Fri, 22 Mar 2024 00:32:43 +0000 Cleanup finish scripts Diffstat:
| M | service_scripts/generic/finish | | | 7 | ++----- |
| M | service_scripts/xsession/finish | | | 6 | ++---- |
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/service_scripts/generic/finish b/service_scripts/generic/finish @@ -6,11 +6,8 @@ multisubstitute { importas -i CONTAINER_NAME CONTAINER_NAME importas -i CONTAINER_USER CONTAINER_USER } -multisubstitute { - define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER} -# define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME} -} -foreground { umount --recursive data/root } +define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER} + foreground { rm -rf ${CONTAINER_TMPFS} } foreground { sleep .1 } # let logger flush buffers s6-svc -a log # rotate the log diff --git a/service_scripts/xsession/finish b/service_scripts/xsession/finish @@ -6,10 +6,8 @@ multisubstitute { importas -i CONTAINER_NAME CONTAINER_NAME importas -i CONTAINER_USER CONTAINER_USER } -multisubstitute { - define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER} -# define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME} -} +define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER} + foreground { if { test -f ${CONTAINER_TMPFS}/run/uncaught-logs/current } mv ${CONTAINER_TMPFS}/run/uncaught-logs/current data/lastlog