From 903196d0d788dca44a408a5e05c2290f3e08aa4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Wed, 1 Mar 2023 23:02:19 +0100 Subject: [PATCH] Copy /etc/skell/ if .profile file does not exist --- scripts/bin/container-init | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/bin/container-init b/scripts/bin/container-init index 6562d86..a1d0968 100755 --- a/scripts/bin/container-init +++ b/scripts/bin/container-init @@ -43,11 +43,11 @@ else passwd -d "${UNPRIVILEGED_USER_NAME:?}" fi -# Copy /etc/skel/ to unprivileged user home if empty +# Copy /etc/skel/ to unprivileged user home if certain files do not exist UNPRIVILEGED_USER_HOME=$(getent passwd "${UNPRIVILEGED_USER_NAME:?}" | cut -d: -f6) -if [ -z "$(ls -A "${UNPRIVILEGED_USER_HOME:?}")" ]; then - cp -aT /etc/skel/ "${UNPRIVILEGED_USER_HOME:?}" - chown -R "${UNPRIVILEGED_USER_NAME:?}:" "${UNPRIVILEGED_USER_HOME:?}" +if [ ! -e "${UNPRIVILEGED_USER_HOME:?}"/.profile ]; then + cp -aT /etc/skel/ "${UNPRIVILEGED_USER_HOME:?}" 2>/dev/null ||: + chown -R "${UNPRIVILEGED_USER_NAME:?}:" "${UNPRIVILEGED_USER_HOME:?}" 2>/dev/null ||: fi # Create /run/dbus/ directory if it does not exist