From 37f7280dba56ebfbf13a8e3726562cf32ca76716 Mon Sep 17 00:00:00 2001 From: "Josh.5" Date: Tue, 19 Sep 2023 15:59:35 +1200 Subject: [PATCH] Move home directory config installation to desktop config init.d script --- overlay/etc/cont-init.d/70-configure_desktop.sh | 12 ++++++++++-- overlay/usr/bin/start-desktop.sh | 7 ------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/overlay/etc/cont-init.d/70-configure_desktop.sh b/overlay/etc/cont-init.d/70-configure_desktop.sh index 99fe7ff..f5974d5 100644 --- a/overlay/etc/cont-init.d/70-configure_desktop.sh +++ b/overlay/etc/cont-init.d/70-configure_desktop.sh @@ -8,7 +8,15 @@ else echo "Desktop service not available when container is run in 'secondary' mode." sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/desktop.ini fi -echo "Ensure home directory template is owned by the default user." -chown -R ${PUID}:${PGID} /templates/home_directory_template + +# Setup home directory +if [[ ! -f /tmp/.home-directory-template-updated ]]; then + echo "Ensure home directory template is owned by the default user." + chown -R ${PUID}:${PGID} /templates/home_directory_template + echo "Installing default home directory template" + mkdir -p "${USER_HOME:?}" + rsync -aq /templates/home_directory_template/ "${USER_HOME:?}"/ + touch /tmp/.home-directory-template-updated +fi echo "DONE" diff --git a/overlay/usr/bin/start-desktop.sh b/overlay/usr/bin/start-desktop.sh index 515a9d4..2e9e350 100755 --- a/overlay/usr/bin/start-desktop.sh +++ b/overlay/usr/bin/start-desktop.sh @@ -31,13 +31,6 @@ export XDG_CONFIG_HOME="${USER_HOME:?}/.config" export XDG_DATA_HOME="${USER_HOME:?}/.local/share" # EXECUTE PROCESS: -# Setup home directory -if [[ ! -f /tmp/.home-directory-template-updated ]]; then - echo "Installing default home directory template" - mkdir -p "${USER_HOME:?}" - rsync -aq /templates/home_directory_template/ "${USER_HOME:?}"/ - touch /tmp/.home-directory-template-updated -fi # Wait for the X server to start wait_for_x # Install/Upgrade user apps