crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reordered some tasks in the init script

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2022-01-16 02:05:05 +01:00
parent c34261f8aa
commit 63d836a4da
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/bin/container-init
View File

@@ -36,6 +36,13 @@ if ! getent passwd "${UNPRIVILEGED_USER_UID:?}" >/dev/null 2>&1; then
"${UNPRIVILEGED_USER_NAME:?}"
fi
# Set unprivileged user password
if [ -n "${UNPRIVILEGED_USER_PASSWORD?}" ]; then
printf '%s' "${UNPRIVILEGED_USER_NAME:?}:${UNPRIVILEGED_USER_PASSWORD:?}" | chpasswd
else
passwd -d "${UNPRIVILEGED_USER_NAME:?}"
fi
# Copy /etc/skel/ to unprivileged user home if empty
UNPRIVILEGED_USER_HOME=$(getent passwd "${UNPRIVILEGED_USER_NAME:?}" | cut -d: -f6)
if [ -z "$(ls -A "${UNPRIVILEGED_USER_HOME:?}")" ]; then
@@ -43,16 +50,30 @@ if [ -z "$(ls -A "${UNPRIVILEGED_USER_HOME:?}")" ]; then
chown -R "${UNPRIVILEGED_USER_NAME:?}:" "${UNPRIVILEGED_USER_HOME:?}"
fi
# Create /run/user/${UNPRIVILEGED_USER_UID}/dbus-1/ directory
mkdir -p /run/user/"${UNPRIVILEGED_USER_UID:?}"/dbus-1/
chmod -R 700 /run/user/"${UNPRIVILEGED_USER_UID:?}"/
chown -R "${UNPRIVILEGED_USER_NAME:?}:" /run/user/"${UNPRIVILEGED_USER_UID:?}"/
# Create /run/dbus/ directory if it does not exist
if [ ! -d /run/dbus/ ]; then
mkdir -p /run/dbus/
chmod 755 /run/dbus/
chown messagebus: /run/dbus/
fi
# Set unprivileged user password
if [ -n "${UNPRIVILEGED_USER_PASSWORD?}" ]; then
printf '%s' "${UNPRIVILEGED_USER_NAME:?}:${UNPRIVILEGED_USER_PASSWORD:?}" | chpasswd
else
passwd -d "${UNPRIVILEGED_USER_NAME:?}"
# Create /run/sshd/ directory if it does not exist
if [ ! -d /run/sshd/ ]; then
mkdir -p /run/sshd/
chmod 755 /run/sshd/
fi
# Create /run/udev/ directory if it does not exist
if [ ! -d /run/udev/ ]; then
mkdir -p /run/udev/
chmod 755 /run/udev/
fi
# Create /run/user/${UNPRIVILEGED_USER_UID}/ directory if it does not exist
if [ ! -d /run/user/"${UNPRIVILEGED_USER_UID:?}"/ ]; then
mkdir -p /run/user/"${UNPRIVILEGED_USER_UID:?}"/
chmod 700 /run/user/"${UNPRIVILEGED_USER_UID:?}"/
chown "${UNPRIVILEGED_USER_NAME:?}:" /run/user/"${UNPRIVILEGED_USER_UID:?}"/
fi
# Enable xdummy service if ENABLE_XDUMMY is true
@@ -76,11 +97,6 @@ if [ -z "${VGL_DISPLAY-}" ]; then
fi
fi
# Create privilege separation directory for SSH server if it does not exist
if [ ! -e /run/sshd/ ]; then
mkdir /run/sshd/
fi
# Generate SSH keys if they do not exist
if [ ! -f /etc/ssh/ssh_host_ed25519_key ]; then
ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N '' >/dev/null