Skip to content

fix: launch polkit agent from libexecdir, not bindir #5

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
perlowja wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: launch polkit agent from libexecdir, not bindir #5

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
13 changes: 12 additions & 1 deletion scripts/install-session.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ if [ -x "/opt/local/bin/singularity-labwc-session" ]; then
else
BIN="$TARGET_HOME/.local/singularity/bin"
LIB="$TARGET_HOME/.local/singularity/lib"
LIBEXEC="$TARGET_HOME/.local/singularity/libexec"
LAUNCHER="$BIN/singularity-session"

cat > "$LAUNCHER" << LAUNCHER_EOF
#!/bin/bash
BIN="$BIN"
LIBEXEC="$LIBEXEC"
export PATH="\$BIN:\$PATH"
export LD_LIBRARY_PATH="$LIB\${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}"
STATE="\${XDG_STATE_HOME:-\$HOME/.local/state}/singularity"
Expand All @@ -34,7 +36,16 @@ LOG="\$STATE/session.log"
exec > "\$LOG" 2>&1
echo "[\$(date)] Starting Singularity session"

nohup "\$BIN/singularity-polkit-agent" >> "\$STATE/polkit.log" 2>&1 &
# meson installs the polkit agent to libexecdir; deploy-to-host.sh flattens it
# into bindir. Prefer libexec, fall back to bin, then to \$PATH.
if [ -x "\$LIBEXEC/singularity-polkit-agent" ]; then
_polkit_agent="\$LIBEXEC/singularity-polkit-agent"
elif [ -x "\$BIN/singularity-polkit-agent" ]; then
_polkit_agent="\$BIN/singularity-polkit-agent"
else
_polkit_agent="\$(command -v singularity-polkit-agent 2>/dev/null || printf '%s' "\$LIBEXEC/singularity-polkit-agent")"
fi
nohup "\$_polkit_agent" >> "\$STATE/polkit.log" 2>&1 &

if [ -n "\$GDM_SESSION_DBUS_ADDRESS" ] && [ -x "/usr/libexec/gdm-wayland-session" ]; then
echo "GDM detected - wrapping with gdm-wayland-session"
Expand Down
16 changes: 15 additions & 1 deletion src/singularity-desktop-session
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ BIN="$(dirname "$SELF")"
PREFIX="$(dirname "$BIN")"
LIB="$PREFIX/lib"
SHARE="$PREFIX/share"
LIBEXEC="$PREFIX/libexec"

@chatgpt-codex-connector chatgpt-codex-connector Bot Aug 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Resolve the configured libexec directory

When the polkit agent is packaged with a nondefault libexecdir such as $prefix/lib/singularity, this hard-coded $PREFIX/libexec path does not match the directory selected by the agent's Meson get_option('libexecdir'). Because private helper directories normally are not on PATH, both subsequent fallbacks also miss the binary and privilege prompts remain unavailable for that valid installation layout. Substitute the configured libexec directory at build time or otherwise share the actual install path rather than assuming the default.

Useful? React with 👍 / 👎.


# Resolve an installed helper. meson installs some helpers (the polkit agent and
# its auth helper) to libexecdir, while scripts/deploy-to-host.sh flattens them
# into bindir. Prefer libexec, fall back to bin, then to $PATH.
singularity_helper() {
if [ -x "$LIBEXEC/$1" ]; then
printf '%s\n' "$LIBEXEC/$1"
elif [ -x "$BIN/$1" ]; then
printf '%s\n' "$BIN/$1"
else
command -v "$1" 2>/dev/null || printf '%s\n' "$LIBEXEC/$1"
fi
}

export LD_LIBRARY_PATH="$LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
export PATH="$BIN:$PATH"
Expand Down Expand Up @@ -57,7 +71,7 @@ pkill -TERM -x singularity-desktop 2>/dev/null || true
pkill -x singularity-polkit-agent 2>/dev/null || true
pkill -TERM -x ush-broker 2>/dev/null || true
sleep 0.3
nohup "$BIN/singularity-polkit-agent" >> "$_STATE/polkit.log" 2>&1 &
nohup "$(singularity_helper singularity-polkit-agent)" >> "$_STATE/polkit.log" 2>&1 &
if [ -x "$BIN/ush-broker" ]; then
nohup "$BIN/ush-broker" >> "$_STATE/ush-broker.log" 2>&1 &
fi
Expand Down