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

Merge branch 'devel' into feature/unsafe-browser

parents 81d598f2 5ff4153b
......@@ -18,6 +18,10 @@ Package: iceweasel
Pin: origin mozilla.debian.net
Pin-Priority: 999
Package: libcairo2
Pin: origin backports.debian.org
Pin-Priority: 999
Package: libgnupg-interface-perl
Pin: origin backports.debian.org
Pin-Priority: 999
......
......@@ -11,7 +11,7 @@ if [ $2 != "up" ]; then
fi
# 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
fi
......@@ -19,4 +19,4 @@ fi
. /etc/live/config.d/username
export DISPLAY=':0.0'
export XAUTHORITY="`echo /var/run/gdm3/auth-for-${LIVE_USERNAME}-*/database`"
exec /bin/su -c iceweasel &
exec /bin/su -c iceweasel "${LIVE_USERNAME}" &
......@@ -58,8 +58,8 @@ my $notification = $notify->create(summary => $summary,
or die "Failed to create notification object";
debug('$notification:' . "\n" . Dumper($notification));
# Make sure Gnome has started so the notification can be shown
until (system("pidof", "gnome-panel") == 0) {
# Wait until notifications can be shown
until (system("pidof", "notification-daemon") == 0) {
sleep 1
}
......
Supports Markdown
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