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
826eb34d
Commit
826eb34d
authored
Nov 27, 2012
by
Tails developers
Browse files
Use shell library in the Unsafe Browser.
parent
cff55ff9
Changes
1
Hide whitespace changes
Inline
Side-by-side
config/chroot_local-includes/usr/local/sbin/unsafe-browser
View file @
826eb34d
...
...
@@ -16,9 +16,9 @@ CHROOT=${CONF_DIR}/chroot
CLEARNET_USER
=
clearnet
OFFENDING_ADDONS
=
"xul-ext-foxyproxy-standard xul-ext-torbutton xul-ext-firegpg
xul-ext-cookie-monster xul-ext-noscript xul-ext-monkeysphere"
TOR_DIR
=
/var/lib/tor
TOR_DESCRIPTORS
=
${
TOR_DIR
}
/cached-descriptors
TOR_WORKING
=
""
# Import tor_is_working()
.
/usr/local/lib/tails-shell-library/tor.sh
WARNING_PAGE
=
'/usr/share/doc/tails/website/misc/unsafe_browser_warning'
LANG_CODE
=
"
$(
echo
${
LANG
}
|
head
-c
2
)
"
...
...
@@ -189,14 +189,6 @@ show_shutdown_notification () {
notify-send
-t
10000
"
${
title
}
"
"
${
body
}
"
}
tor_is_working
()
{
# FIXME: the approach is stolen from is_tor_working() in the 20-time
# NM hook -- we should move things like this to a shell script library
# FIXME: how to determine this reliably? this approach doesn't work
# if $TOR_DIR is persistent.
[
-e
$TOR_DESCRIPTORS
]
}
maybe_restart_tor
()
{
# Restart Tor if it's not working (a captive portal may have prevented
# Tor from bootstrapping, and a restart is the fastest way to get
...
...
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