Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
d35e3888
Commit
d35e3888
authored
Mar 13, 2012
by
Tails developers
Browse files
Merge branch 'bugfix/time_sync_notification' into devel
parents
8be3168a
2590e359
Changes
3
Hide whitespace changes
Inline
Side-by-side
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/20-time.sh
View file @
d35e3888
...
...
@@ -210,9 +210,17 @@ is_clock_way_off() {
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
start_notification_helper
# Delegate time setting to other daemons if Tor connections work
if
tor_is_working
;
then
log
"Tor has already opened a circuit"
...
...
config/chroot_local-includes/etc/xdg/autostart/time-sync-notify.desktop
deleted
100644 → 0
View file @
8be3168a
[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;
config/chroot_local-includes/usr/local/bin/tails-htp-notify-user
View file @
d35e3888
...
...
@@ -58,6 +58,11 @@ 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
)
{
sleep
1
}
$notification
->
show
()
or
warn
"
Failed showing notification.
";
# Wait until htpdate is done
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment