Commit cab10ea8 authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/devel' into feature/10858-tor-browser-5.5

parents ea1e2836 6a712dca
......@@ -6,5 +6,5 @@ echo "Generating Tor Browser profile"
set -e
/usr/local/bin/generate-tor-browser-profile
/usr/local/lib/generate-tor-browser-profile
mv ~/.tor-browser /etc/skel
......@@ -8,5 +8,5 @@ CONFFILE='/etc/default/htpdate.user-agent'
install -o root -g root -m 0644 /dev/null "$CONFFILE"
echo "HTTP_USER_AGENT=\"$(/usr/local/bin/getTorBrowserUserAgent)\"" \
echo "HTTP_USER_AGENT=\"$(/usr/local/lib/getTorBrowserUserAgent)\"" \
> "$CONFFILE"
......@@ -211,7 +211,7 @@ is_clock_way_off() {
start_notification_helper() {
export_gnome_env
exec /bin/su -c /usr/local/bin/tails-htp-notify-user "$LIVE_USERNAME" &
exec /bin/su -c /usr/local/lib/tails-htp-notify-user "$LIVE_USERNAME" &
}
......
......@@ -85,5 +85,5 @@ antialiasing = 'rgba'
hinting = 'slight'
[org/gnome/shell]
enabled-extensions = ['alternative-status-menu@gnome-shell-extensions.gcampax.github.com', 'topIcons@adel.gadllah@gmail.com', 'shutdown-helper@tails.boum.org']
enabled-extensions = ['apps-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com', 'topIcons@adel.gadllah@gmail.com', 'shutdown-helper@tails.boum.org']
favorite-apps=['tor-browser.desktop', 'icedove.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
......@@ -3,7 +3,7 @@ ProxyCommand none
Host *
ProxyCommand /usr/local/bin/connect-socks %h %p
ProxyCommand /usr/local/lib/connect-socks %h %p
Ciphers aes256-ctr,aes256-cbc,aes128-ctr,aes128-cbc,3des-cbc
MACs hmac-sha1,hmac-md5,hmac-ripemd160
......
amnesia ALL = NOPASSWD: /usr/local/sbin/kill-boot-profile
amnesia ALL = NOPASSWD: /usr/local/lib/kill-boot-profile
# Note: ATTR{type}=="1" means ethernet (ARPHDR_ETHER, see Linux'
# sources, beginning of include/linux/if_arp.h)
SUBSYSTEM=="net", ACTION=="add", ATTR{type}=="1", RUN+="/usr/local/sbin/tails-spoof-mac $name"
SUBSYSTEM=="net", ACTION=="add", ATTR{type}=="1", RUN+="/usr/local/lib/tails-spoof-mac $name"
......@@ -20,13 +20,13 @@ Start_boot_profile ()
Version=1.0
Name=EndProfile
GenericName=EndProfile
Exec=/usr/local/bin/end-profile
Exec=/usr/local/lib/end-profile
Terminal=false
Type=Application
EOF
echo 32768 >/proc/sys/fs/inotify/max_user_watches
/usr/local/sbin/boot-profile /var/log/boot-profile
/usr/local/lib/boot-profile /var/log/boot-profile
# Put readahead list at the very begining
head -n 1 /usr/share/amnesia/readahead-list >/dev/null || true
......
......@@ -5,7 +5,7 @@ After=memlockd.service tails-reconfigure-kexec.service tails-reconfigure-memlock
[Service]
Type=simple
ExecStart=/usr/local/sbin/udev-watchdog-wrapper
ExecStart=/usr/local/lib/udev-watchdog-wrapper
CapabilityBoundingSet=~CAP_SYS_ADMIN
PrivateNetwork=yes
PrivateTmp=yes
......
......@@ -4,7 +4,7 @@ Documentation=https://tails.boum.org/contribute/design/
[Service]
Type=oneshot
ExecStart=/usr/local/sbin/tails-set-wireless-devices-state
ExecStart=/usr/local/lib/tails-set-wireless-devices-state
CapabilityBoundingSet=~CAP_SYS_ADMIN
PrivateDevices=yes
PrivateNetwork=yes
......
......@@ -4,7 +4,7 @@ Documentation=https://tails.boum.org/contribute/design/
[Service]
Type=simple
ExecStart=/usr/local/sbin/tor-controlport-filter
ExecStart=/usr/local/lib/tor-controlport-filter
User=tor-controlport-filter
Group=tor-controlport-filter
CapabilityBoundingSet=
......
......@@ -4,7 +4,7 @@ Documentation=https://tails.boum.org/contribute/design/
[Service]
Type=oneshot
ExecStart=/usr/local/bin/tails-configure-keyboard
ExecStart=/usr/local/lib/tails-configure-keyboard
RemainAfterExit=yes
[Install]
......
......@@ -4,7 +4,7 @@ Documentation=https://tails.boum.org/contribute/design/virtualization_support/
[Service]
Type=oneshot
ExecStart=/usr/local/bin/tails-virt-notify-user
ExecStart=/usr/local/lib/tails-virt-notify-user
RemainAfterExit=yes
[Install]
......
......@@ -43,7 +43,7 @@ tor_has_bootstrapped() {
start_browser() {
if [ ! -d "${PROFILE}" ]; then
/usr/local/bin/generate-tor-browser-profile
/usr/local/lib/generate-tor-browser-profile
fi
TMPDIR="${PROFILE}/tmp"
......
......@@ -7,4 +7,4 @@ test -e /boot-profile.pid || exit 0
# Wait some time hoping Tor has bootstrapped and Tor Browser is started
sleep 180
sudo -n /usr/local/sbin/kill-boot-profile
sudo -n /usr/local/lib/kill-boot-profile
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