Skip to content

Commit f80521b

Browse files
committed
#31 fix DinD messing with tmp and start dbus service
1 parent e7c8da4 commit f80521b

6 files changed

Lines changed: 21 additions & 4 deletions

File tree

root/defaults/startwm.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@ if which nvidia-smi && [ "${DISABLE_ZINK}" == "false" ]; then
77
export GALLIUM_DRIVER=zink
88
fi
99

10-
/usr/bin/openbox-session
10+
# Dbus defaults
11+
export XDG_RUNTIME_DIR="/tmp/xdg-runtime-${PUID}"
12+
mkdir -p -m700 "${XDG_RUNTIME_DIR}"
13+
chown -R "${PUID}:${PGID}" "${XDG_RUNTIME_DIR}"
14+
15+
# Start DE
16+
exec dbus-launch --exit-with-session /usr/bin/openbox-session > /dev/null 2>&1

root/etc/s6-overlay/s6-rc.d/svc-docker/dependencies.d/svc-de renamed to root/etc/s6-overlay/s6-rc.d/svc-dbus/dependancies.d/init-services

File renamed without changes.

root/etc/s6-overlay/s6-rc.d/svc-dbus/dependancies.d/svc-xorg

Whitespace-only changes.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
# Folder setup
4+
mkdir -p /run/dbus
5+
chown abc:abc /run/dbus
6+
7+
# Run dbus
8+
exec s6-setuidgid abc \
9+
dbus-daemon \
10+
--system \
11+
--nofork \
12+
--nosyslog
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
longrun

root/etc/s6-overlay/s6-rc.d/svc-docker/run

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#!/usr/bin/with-contenv bash
22

3-
# We need to wait for kclient to be full up as docker init breaks audio
4-
sleep 5
5-
63
# Make sure this is a priv container
74
if [ -e /dev/cpu_dma_latency ]; then
85
if [ "${START_DOCKER}" == "true" ]; then
6+
mount -t tmpfs none /tmp
97
exec /usr/local/bin/dockerd-entrypoint.sh -l error
108
else
119
sleep infinity

0 commit comments

Comments
 (0)