Skip to content

Commit

Permalink
Use dbus-user-session
Browse files Browse the repository at this point in the history
  • Loading branch information
ehfd authored Jun 22, 2024
1 parent eb80950 commit 3fbb1aa
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ RUN apt-get clean && apt-get update && apt-get dist-upgrade -y && apt-get instal
apt-utils \
dbus-user-session \
fakeroot \
fuse \
locales \
ssl-cert \
sudo \
Expand Down Expand Up @@ -118,8 +117,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
libvulkan-dev \
ocl-icd-libopencl1 \
clinfo \
dbus-x11 \
libdbus-c++-1-0v5 \
xkb-data \
xauth \
xbitmaps \
Expand Down Expand Up @@ -323,7 +320,6 @@ Pin-Priority: -1" > /etc/apt/preferences.d/firefox-nosnap && \
desktop-file-utils \
dolphin \
dolphin-plugins \
dbus-x11 \
enchant-2 \
fcitx \
fcitx-frontend-gtk2 \
Expand Down
4 changes: 2 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ fi
export XDG_SESSION_ID="${DISPLAY#*:}"
if [ -n "$(nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)" ]; then
export VGL_REFRESHRATE="${DESKTOP_REFRESH}"
/usr/bin/vglrun -d "${VGL_DISPLAY:-egl}" +wm /usr/bin/dbus-launch --exit-with-session /usr/bin/startplasma-x11 &
/usr/bin/vglrun -d "${VGL_DISPLAY:-egl}" +wm /usr/bin/startplasma-x11 &
else
/usr/bin/dbus-launch --exit-with-session /usr/bin/startplasma-x11 &
/usr/bin/startplasma-x11 &
fi

# Start Fcitx input method framework
Expand Down
2 changes: 1 addition & 1 deletion supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ serverurl=unix:///tmp/supervisor.sock
files = /etc/supervisor/conf.d/*.conf

[program:entrypoint]
command=bash -c "/etc/entrypoint.sh"
command=bash -c "dbus-run-session -- /etc/entrypoint.sh"
stdout_logfile=/tmp/entrypoint.log
stdout_logfile_backups=0
redirect_stderr=true
Expand Down

0 comments on commit 3fbb1aa

Please sign in to comment.