Skip to content

Clean stale runtime state on init so containers recover from unclean shutdowns #171

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

Clean stale runtime state on init so containers recover from unclean shutdowns #171

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
3 changes: 3 additions & 0 deletions root/etc/s6-overlay/s6-rc.d/init-selkies-config/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ if [ ! -d "$HOME/.XDG" ]; then
mkdir -p "$HOME/.XDG"
chown abc:abc "$HOME/.XDG"
fi
# clean out stale runtime state left behind by unclean shutdowns
find "$HOME/.XDG" -mindepth 1 -delete
rm -f /defaults/pid /defaults/native
printf "$HOME/.XDG" > /run/s6/container_environment/XDG_RUNTIME_DIR

# locale Support
Expand Down
15 changes: 8 additions & 7 deletions root/etc/s6-overlay/s6-rc.d/svc-selkies/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ if [ ! -f '/dev/shm/audio.lock' ]; then
until [ -f /defaults/pid ]; do
sleep .5
done
s6-setuidgid abc with-contenv pactl \
if s6-setuidgid abc with-contenv pactl \
load-module module-null-sink \
sink_name="output" \
sink_properties=device.description="output"
s6-setuidgid abc with-contenv pactl \
load-module module-null-sink \
sink_name="input" \
sink_properties=device.description="input"
touch /dev/shm/audio.lock
sink_properties=device.description="output" && \
s6-setuidgid abc with-contenv pactl \
load-module module-null-sink \
sink_name="input" \
sink_properties=device.description="input"; then
touch /dev/shm/audio.lock
fi
fi

# Setup dev mode if defined
Expand Down
Loading