Skip to content

Let SELKIES_DEBUG show the desktop session's output #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
junkerderprovinz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Let SELKIES_DEBUG show the desktop session's output #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions root/defaults/startwm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ if which nvidia-smi > /dev/null 2>&1 && ls -A /dev/dri 2>/dev/null && [ "${DISAB
export GALLIUM_DRIVER=zink
fi

# Start DE
exec dbus-launch --exit-with-session /usr/bin/openbox-session > /dev/null 2>&1
# Start DE. Output goes wherever svc-de/run pointed it, so SELKIES_DEBUG
# decides whether the session's own logs are kept.
exec dbus-launch --exit-with-session /usr/bin/openbox-session
8 changes: 4 additions & 4 deletions root/defaults/startwm_wayland.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if [ "${PELORUS,,}" == "true" ]; then
kill $ATSPI_PID
kill $LABWC_PID
kill $PELORUS_PID
' > /dev/null 2>&1
'
else
dbus-run-session bash -c '
/usr/libexec/at-spi2-registryd &
Expand All @@ -38,18 +38,18 @@ if [ "${PELORUS,,}" == "true" ]; then
labwc -i
kill $ATSPI_PID
kill $PELORUS_PID
' > /dev/null 2>&1
'
fi
else
if [ "${SELKIES_DESKTOP,,}" == "true" ]; then
labwc > /dev/null 2>&1 &
labwc &
LABWC_PID=$!
sleep 1
export WAYLAND_DISPLAY=wayland-0
export DISPLAY=:0
selkies-desktop
kill $LABWC_PID
else
labwc > /dev/null 2>&1
labwc
fi
fi
15 changes: 13 additions & 2 deletions root/etc/s6-overlay/s6-rc.d/svc-de/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
#!/usr/bin/with-contenv bash

# Where the desktop session's own output goes. Opened here, while this script
# is still root, so the descriptor is inherited across s6-setuidgid and the
# exec into startwm(_wayland).sh: abc never opens it itself. Both entrypoints
# below share it, so the choice lives in one place rather than in each session
# script.
if [[ "${SELKIES_DEBUG,,}" == "true" ]]; then
exec 3>&1
else
exec 3>/dev/null
fi

# wayland entrypoint
if [[ "${PIXELFLUX_WAYLAND,,}" == "true" ]]; then
SOCKET_PATH="${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-1}"
Expand All @@ -10,7 +21,7 @@ if [[ "${PIXELFLUX_WAYLAND,,}" == "true" ]]; then
echo "[svc-de] ${SOCKET_PATH} found launching de"
cd $HOME
exec s6-setuidgid abc \
/bin/bash /defaults/startwm_wayland.sh &
/bin/bash /defaults/startwm_wayland.sh >&3 2>&3 &
PID=$!
echo "$PID" > /de-pid
wait "$PID"
Expand Down Expand Up @@ -55,7 +66,7 @@ chmod 777 /tmp/selkies*
# run
cd $HOME
exec s6-setuidgid abc \
/bin/bash /defaults/startwm.sh &
/bin/bash /defaults/startwm.sh >&3 2>&3 &
PID=$!
echo "$PID" > /de-pid
wait "$PID"
Loading