summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-03-04 16:01:36 +0100
committeranonym <anonym@riseup.net>2017-03-04 16:43:05 +0100
commit288a74ac8de88269c032f883cba28e2c4f4d4d9a (patch)
tree7f89f9454fae5cb9842b116c6034fa94d5793165
parent647fdf3914247d5311e7ccd21b6f2043b463d458 (diff)
tails-*-notify-user scripts: start doc viewer in a subprocess.
Since we `exec()` into `tails-documentation`, these scripts will block until the documentation browser is closed (unless it was already started).
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user10
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user12
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-virt-notify-user12
3 files changed, 20 insertions, 14 deletions
diff --git a/config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user b/config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user
index 6084cf5..65359ac 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user
+++ b/config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user
@@ -36,10 +36,12 @@ textdomain("tails");
sub action_cb {
my $reactor = shift;
- exec(
- '/usr/local/bin/tails-documentation',
- 'news/Tails_3.0_will_require_a_64-bit_processor'
- );
+ unless (fork) {
+ exec(
+ '/usr/local/bin/tails-documentation',
+ 'news/Tails_3.0_will_require_a_64-bit_processor'
+ );
+ }
$reactor->shutdown;
}
diff --git a/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user b/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
index 94d479f..7a03f69 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
+++ b/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
@@ -35,11 +35,13 @@ textdomain("tails");
sub action_cb {
my $reactor = shift;
- exec(
- '/usr/local/bin/tails-documentation',
- 'doc/anonymous_internet/i2p',
- 'removal',
- );
+ unless (fork) {
+ exec(
+ '/usr/local/bin/tails-documentation',
+ 'doc/anonymous_internet/i2p',
+ 'removal',
+ );
+ }
$reactor->shutdown;
}
diff --git a/config/chroot_local-includes/usr/local/lib/tails-virt-notify-user b/config/chroot_local-includes/usr/local/lib/tails-virt-notify-user
index 7e53800..49abe4e 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-virt-notify-user
+++ b/config/chroot_local-includes/usr/local/lib/tails-virt-notify-user
@@ -36,11 +36,13 @@ textdomain("tails");
sub action_cb {
my $reactor = shift;
- exec(
- '/usr/local/bin/tails-documentation',
- 'doc/advanced_topics/virtualization',
- 'security'
- );
+ unless (fork) {
+ exec(
+ '/usr/local/bin/tails-documentation',
+ 'doc/advanced_topics/virtualization',
+ 'security'
+ );
+ }
$reactor->shutdown;
}