Commit fd2f6e5d authored by Tails developers's avatar Tails developers
Browse files

Make the iceweasel NM hook deal with the amnesia user, not root.

parent df63ebd8
...@@ -11,7 +11,7 @@ if [ $2 != "up" ]; then ...@@ -11,7 +11,7 @@ if [ $2 != "up" ]; then
fi fi
# There's nothing to do if Iceweasel is already running # There's nothing to do if Iceweasel is already running
if pidof firefox-bin 1>/dev/null 2>&1; then if pgrep -u "${LIVE_USERNAME}" firefox-bin 1>/dev/null 2>&1; then
exit 0 exit 0
fi fi
...@@ -19,4 +19,4 @@ fi ...@@ -19,4 +19,4 @@ fi
. /etc/live/config.d/username . /etc/live/config.d/username
export DISPLAY=':0.0' export DISPLAY=':0.0'
export XAUTHORITY="`echo /var/run/gdm3/auth-for-${LIVE_USERNAME}-*/database`" export XAUTHORITY="`echo /var/run/gdm3/auth-for-${LIVE_USERNAME}-*/database`"
exec /bin/su -c iceweasel & exec /bin/su -c iceweasel "${LIVE_USERNAME}" &
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment