summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramnesia <amnesia@boum.org>2010-10-02 11:44:46 +0200
committeramnesia <amnesia@boum.org>2010-10-02 17:21:58 +0200
commit328fbe01f21beabd2583257af3095f2dea233783 (patch)
treeb3829c8b888365e77b19187b7a474ccf79c9fae3
parent76644f1fd0cf4affe50b9cbfa36f59cec2558eba (diff)
Shorter virtualisation warning and link to doc
The desktop notification windows was too small for our message to fit in. Only use the notification system for showing the warning and point to proper documentation on the (local) wiki;
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-virt-notify-user3
-rw-r--r--wiki/src/todo/virtualization_support.mdwn4
2 files changed, 1 insertions, 6 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
index 5172679..1b97855 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
+++ b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
@@ -53,8 +53,7 @@ my $notify = Desktop::Notify->new();
my $summary = gettext("Warning: virtual machine detected!");
my $body =
gettext("Both the host operating system and the virtualization software are able to monitor what you are doing in T(A)ILS.") . "\n"
- . gettext("If you are not aware to be using a virtual machine: there could be a <a href='https://amnesia.boum.org/found_a_problem/'>bug</a> in the virtualization detection software T(A)ILS uses... or something really weird is happening.")
- ;
+ . gettext("Please read the <a href='file:///live/image/doc/amnesia/wiki/support/virtualisation.en.html'>documentation page</a> for more information.");
$notify->create(summary => $summary,
body => $body,
diff --git a/wiki/src/todo/virtualization_support.mdwn b/wiki/src/todo/virtualization_support.mdwn
index b561261..aa63af0 100644
--- a/wiki/src/todo/virtualization_support.mdwn
+++ b/wiki/src/todo/virtualization_support.mdwn
@@ -36,10 +36,6 @@ Most of the work [[has been done|contribute/design/virtualization_support]].
Left to do:
-* the desktop notification windows is too small for our message to fit
- in so we have to only use the notification system for showing the
- warning and point to proper documentation on the (local) wiki;
- [[!tag todo/code todo/documentation]]
* when running inside a non-free VM, suggest that the user switches to
VirtualBox or some other free software VM: [[!taglink todo/code]];
* when running inside a VM within a non-free host OS, emphasize the