217d0eb26e
The current supervisor.d configs are configured specifically for a particular supervisor version / installation. This decouples the configuration so we can use it on any distro.
27 lines
933 B
Bash
27 lines
933 B
Bash
|
|
# Configure dbus
|
|
echo "**** Configure container dbus ****";
|
|
if [[ "${HOST_DBUS}" == "true" ]]; then
|
|
echo "Container configured to use the host dbus";
|
|
# Disable supervisord script
|
|
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/dbus.ini
|
|
else
|
|
echo "Container configured to run its own dbus";
|
|
# Enable supervisord script
|
|
sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/dbus.ini
|
|
# Configure dbus to run as USER
|
|
sed -i "/ <user>/c\ <user>${USER}</user>" /usr/share/dbus-1/system.conf
|
|
# Remove old dbus session
|
|
rm -rf ${USER_HOME}/.dbus/session-bus/* 2> /dev/null
|
|
# Remove old dbus pids
|
|
mkdir -p /var/run/dbus
|
|
chown -R ${PUID}:${PGID} /var/run/dbus/
|
|
chmod -R 770 /var/run/dbus/
|
|
# Generate a dbus machine ID
|
|
dbus-uuidgen > /var/lib/dbus/machine-id
|
|
# Remove old lockfiles
|
|
find /var/run/dbus -name "pid" -exec rm -f {} \;
|
|
fi
|
|
|
|
echo "DONE"
|