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

Merge branch 'bugfix/time_sync_notification' into devel

parents 8be3168a 2590e359
...@@ -210,9 +210,17 @@ is_clock_way_off() { ...@@ -210,9 +210,17 @@ is_clock_way_off() {
return 1 return 1
} }
start_notification_helper() {
export DISPLAY=':0.0'
export XAUTHORITY="$(echo /var/run/gdm3/auth-for-$LIVE_USERNAME-*/database)"
exec /bin/su -c /usr/local/bin/tails-htp-notify-user "$LIVE_USERNAME" &
}
### Main ### Main
start_notification_helper
# Delegate time setting to other daemons if Tor connections work # Delegate time setting to other daemons if Tor connections work
if tor_is_working; then if tor_is_working; then
log "Tor has already opened a circuit" log "Tor has already opened a circuit"
......
[Desktop Entry]
Name=tails-htp-notify-user
GenericName=notify user of time synchronization process
Comment=notify user of time synchronization process
Exec=/usr/local/bin/tails-htp-notify-user
Terminal=false
Type=Application
Categories=GNOME;X-GNOME-PersonalSettings;
NoDisplay=true
MimeType=application/x-tails-htp-notify-user;
...@@ -58,6 +58,11 @@ my $notification = $notify->create(summary => $summary, ...@@ -58,6 +58,11 @@ my $notification = $notify->create(summary => $summary,
or die "Failed to create notification object"; or die "Failed to create notification object";
debug('$notification:' . "\n" . Dumper($notification)); debug('$notification:' . "\n" . Dumper($notification));
# Make sure Gnome has started so the notification can be shown
until (system("pidof", "gnome-panel") == 0) {
sleep 1
}
$notification->show() or warn "Failed showing notification."; $notification->show() or warn "Failed showing notification.";
# Wait until htpdate is done # Wait until htpdate is done
......
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