Move home directory config installation to desktop config init.d script
This commit is contained in:
@@ -8,7 +8,15 @@ else
|
|||||||
echo "Desktop service not available when container is run in 'secondary' mode."
|
echo "Desktop service not available when container is run in 'secondary' mode."
|
||||||
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/desktop.ini
|
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/desktop.ini
|
||||||
fi
|
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"
|
echo "DONE"
|
||||||
|
|||||||
@@ -31,13 +31,6 @@ export XDG_CONFIG_HOME="${USER_HOME:?}/.config"
|
|||||||
export XDG_DATA_HOME="${USER_HOME:?}/.local/share"
|
export XDG_DATA_HOME="${USER_HOME:?}/.local/share"
|
||||||
|
|
||||||
# EXECUTE PROCESS:
|
# 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 the X server to start
|
||||||
wait_for_x
|
wait_for_x
|
||||||
# Install/Upgrade user apps
|
# Install/Upgrade user apps
|
||||||
|
|||||||
Reference in New Issue
Block a user