Commit 44da8ff0 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' of ssh://webmasters.boum.org/~/wiki

parents fe0eb447 b0ec2369
......@@ -25,6 +25,7 @@ require 'uri'
$:.unshift File.expand_path('../vagrant/lib', __FILE__)
require 'tails_build_settings'
require 'vagrant_version'
# Path to the directory which holds our Vagrantfile
VAGRANT_PATH = File.expand_path('../vagrant', __FILE__)
......@@ -41,23 +42,40 @@ EXTERNAL_HTTP_PROXY = ENV['http_proxy']
# In-VM proxy URL
INTERNEL_HTTP_PROXY = "http://#{VIRTUAL_MACHINE_HOSTNAME}:3142"
def current_vm_memory
def primary_vm
env = Vagrant::Environment.new(:cwd => VAGRANT_PATH, :ui_class => Vagrant::UI::Basic)
uuid = env.primary_vm.uuid
info = env.primary_vm.driver.execute 'showvminfo', uuid, '--machinereadable'
if vagrant_old
return env.primary_vm
else
name = env.primary_machine_name
return env.machine(name, env.default_provider)
end
end
def primary_vm_state
if vagrant_old
return primary_vm.state
else
return primary_vm.state.id
end
end
def current_vm_memory
vm = primary_vm
uuid = vm.uuid
info = vm.driver.execute 'showvminfo', uuid, '--machinereadable'
$1.to_i if info =~ /^memory=(\d+)/
end
def current_vm_cpus
env = Vagrant::Environment.new(:cwd => VAGRANT_PATH, :ui_class => Vagrant::UI::Basic)
uuid = env.primary_vm.uuid
info = env.primary_vm.driver.execute 'showvminfo', uuid, '--machinereadable'
vm = primary_vm
uuid = vm.uuid
info = vm.driver.execute 'showvminfo', uuid, '--machinereadable'
$1.to_i if info =~ /^cpus=(\d+)/
end
def vm_running?
env = Vagrant::Environment.new(:cwd => VAGRANT_PATH, :ui_class => Vagrant::UI::Basic)
env.primary_vm.state == :running
primary_vm_state == :running
end
def enough_free_memory?
......@@ -197,9 +215,12 @@ desc 'Build Tails'
task :build => ['parse_build_options', 'ensure_clean_repository', 'validate_http_proxy', 'vm:up'] do
exported_env = EXPORTED_VARIABLES.select { |k| ENV[k] }.
collect { |k| "#{k}='#{ENV[k]}'" }.join(' ')
env = Vagrant::Environment.new(:cwd => VAGRANT_PATH)
status = env.primary_vm.channel.execute("#{exported_env} build-tails",
if vagrant_old
chan = primary_vm.channel
else
chan = primary_vm.communicate
end
status = chan.execute("#{exported_env} build-tails",
:error_check => false) do |fd, data|
(fd == :stdout ? $stdout : $stderr).write data
end
......@@ -214,8 +235,7 @@ end
namespace :vm do
desc 'Start the build virtual machine'
task :up => ['parse_build_options', 'validate_http_proxy'] do
env = Vagrant::Environment.new(:cwd => VAGRANT_PATH, :ui_class => Vagrant::UI::Basic)
case env.primary_vm.state
case primary_vm_state
when :not_created
# Do not use non-existant in-VM proxy to download the basebox
if ENV['http_proxy'] == INTERNEL_HTTP_PROXY
......@@ -268,6 +288,7 @@ namespace :vm do
abort 'The virtual machine needs to be reloaded to change the number of CPUs. Aborting.'
end
end
env = Vagrant::Environment.new(:cwd => VAGRANT_PATH, :ui_class => Vagrant::UI::Basic)
result = env.cli('up')
abort "'vagrant up' failed" unless result
......
......@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
--memtest none \
--packages-lists="standard" \
--tasks="standard" \
--linux-packages="linux-image-3.10-3" \
--linux-packages="linux-image-3.12-1" \
--syslinux-menu vesamenu \
--syslinux-splash data/splash.png \
--syslinux-timeout 4 \
......
......@@ -476,7 +476,7 @@ etc/init.d/udev 32126
lib/udev/create_static_nodes 32125
etc/udev/links.conf 32124
sbin/udevd 32123
lib/modules/3.10-3-686-pae/modules.devname 32122
lib/modules/3.12-1-686-pae/modules.devname 32122
lib/udev/rules.d/10-blackberry.rules 32121
lib/udev/rules.d/40-hplip.rules 32120
lib/udev/rules.d/40-usb_modeswitch.rules 32119
......@@ -566,54 +566,54 @@ lib/linux-sound-base/noOSS.modprobe.conf 32036
etc/modprobe.d/no-pc-speaker.conf 32035
etc/modprobe.d/open-vm-tools.conf 32034
etc/modprobe.d/radeon-kms.conf 32033
lib/modules/3.10-3-686-pae/modules.alias.bin 32032
lib/modules/3.10-3-686-pae/modules.dep.bin 32031
lib/modules/3.10-3-686-pae/kernel/drivers/virtio/virtio_balloon.ko 32030
lib/modules/3.10-3-686-pae/modules.builtin.bin 32029
lib/modules/3.10-3-686-pae/kernel/drivers/char/virtio_console.ko 32028
lib/modules/3.10-3-686-pae/kernel/drivers/input/serio/serio_raw.ko 32027
lib/modules/3.12-1-686-pae/modules.alias.bin 32032
lib/modules/3.12-1-686-pae/modules.dep.bin 32031
lib/modules/3.12-1-686-pae/kernel/drivers/virtio/virtio_balloon.ko 32030
lib/modules/3.12-1-686-pae/modules.builtin.bin 32029
lib/modules/3.12-1-686-pae/kernel/drivers/char/virtio_console.ko 32028
lib/modules/3.12-1-686-pae/kernel/drivers/input/serio/serio_raw.ko 32027
lib/udev/hwclock-set 32026
lib/modules/3.10-3-686-pae/kernel/drivers/input/evdev.ko 32025
lib/modules/3.12-1-686-pae/kernel/drivers/input/evdev.ko 32025
lib/udev/lmt-udev 32024
lib/modules/3.10-3-686-pae/kernel/drivers/acpi/button.ko 32023
lib/modules/3.12-1-686-pae/kernel/drivers/acpi/button.ko 32023
sbin/blkid 32022
lib/modules/3.10-3-686-pae/kernel/drivers/char/tpm/tpm_bios.ko 32021
lib/modules/3.10-3-686-pae/kernel/crypto/aes_generic.ko 32020
lib/modules/3.12-1-686-pae/kernel/drivers/char/tpm/tpm_bios.ko 32021
lib/modules/3.12-1-686-pae/kernel/crypto/aes_generic.ko 32020
lib/udev/input_id 32019
usr/share/misc/pci.ids 32018
lib/udev/hotplug.functions 32017
lib/modules/3.10-3-686-pae/kernel/drivers/thermal/thermal_sys.ko 32016
lib/modules/3.12-1-686-pae/kernel/drivers/thermal/thermal_sys.ko 32016
lib/udev/net.agent 32015
lib/modules/3.10-3-686-pae/kernel/sound/core/snd-page-alloc.ko 32014
lib/modules/3.12-1-686-pae/kernel/sound/core/snd-page-alloc.ko 32014
lib/udev/udisks-part-id 32013
lib/udev/fstab_import 32012
lib/udev/path_id 32011
lib/libudev.so.0.9.3 32010
lib/modules/3.10-3-686-pae/kernel/drivers/acpi/processor.ko 32009
lib/modules/3.10-3-686-pae/kernel/drivers/char/tpm/tpm.ko 32008
lib/modules/3.10-3-686-pae/kernel/arch/x86/crypto/aes-i586.ko 32007
lib/modules/3.10-3-686-pae/kernel/drivers/input/mouse/psmouse.ko 32005
lib/modules/3.10-3-686-pae/kernel/drivers/i2c/i2c-core.ko 32004
lib/modules/3.10-3-686-pae/kernel/crypto/cryptd.ko 32003
lib/modules/3.12-1-686-pae/kernel/drivers/acpi/processor.ko 32009
lib/modules/3.12-1-686-pae/kernel/drivers/char/tpm/tpm.ko 32008
lib/modules/3.12-1-686-pae/kernel/arch/x86/crypto/aes-i586.ko 32007
lib/modules/3.12-1-686-pae/kernel/drivers/input/mouse/psmouse.ko 32005
lib/modules/3.12-1-686-pae/kernel/drivers/i2c/i2c-core.ko 32004
lib/modules/3.12-1-686-pae/kernel/crypto/cryptd.ko 32003
usr/sbin/laptop_mode 32002
lib/modules/3.10-3-686-pae/kernel/sound/soundcore.ko 32001
lib/modules/3.12-1-686-pae/kernel/sound/soundcore.ko 32001
lib/libparted.so.0.0.1 32000
lib/modules/3.10-3-686-pae/kernel/drivers/char/tpm/tpm_tis.ko 31999
lib/modules/3.10-3-686-pae/kernel/drivers/i2c/busses/i2c-piix4.ko 31998
lib/modules/3.10-3-686-pae/kernel/sound/core/snd.ko 31997
lib/modules/3.10-3-686-pae/kernel/arch/x86/crypto/aesni-intel.ko 31996
lib/modules/3.12-1-686-pae/kernel/drivers/char/tpm/tpm_tis.ko 31999
lib/modules/3.12-1-686-pae/kernel/drivers/i2c/busses/i2c-piix4.ko 31998
lib/modules/3.12-1-686-pae/kernel/sound/core/snd.ko 31997
lib/modules/3.12-1-686-pae/kernel/arch/x86/crypto/aesni-intel.ko 31996
bin/which 31995
lib/modules/3.10-3-686-pae/kernel/arch/x86/crypto/crc32c-intel.ko 31994
lib/modules/3.12-1-686-pae/kernel/arch/x86/crypto/crc32c-intel.ko 31994
etc/laptop-mode/conf.d/ac97-powersave.conf 31993
lib/modules/3.10-3-686-pae/kernel/sound/core/seq/snd-seq-device.ko 31992
lib/modules/3.10-3-686-pae/kernel/sound/core/snd-timer.ko 31991
lib/modules/3.10-3-686-pae/kernel/sound/core/seq/snd-seq.ko 31990
lib/modules/3.10-3-686-pae/kernel/sound/core/snd-pcm.ko 31989
lib/modules/3.12-1-686-pae/kernel/sound/core/seq/snd-seq-device.ko 31992
lib/modules/3.12-1-686-pae/kernel/sound/core/snd-timer.ko 31991
lib/modules/3.12-1-686-pae/kernel/sound/core/seq/snd-seq.ko 31990
lib/modules/3.12-1-686-pae/kernel/sound/core/snd-pcm.ko 31989
bin/vmmouse_detect 31988
etc/laptop-mode/conf.d/auto-hibernate.conf 31987
lib/libdevmapper.so.1.02.1 31986
lib/modules/3.10-3-686-pae/kernel/sound/ac97_bus.ko 31985
lib/modules/3.10-3-686-pae/kernel/sound/pci/ac97/snd-ac97-codec.ko 31984
lib/modules/3.12-1-686-pae/kernel/sound/ac97_bus.ko 31985
lib/modules/3.12-1-686-pae/kernel/sound/pci/ac97/snd-ac97-codec.ko 31984
etc/laptop-mode/conf.d/battery-level-polling.conf 31983
etc/laptop-mode/conf.d/bluetooth.conf 31982
etc/laptop-mode/conf.d/configuration-file-control.conf 31981
......@@ -639,7 +639,7 @@ etc/laptop-mode/conf.d/wireless-iwl-power.conf 31962
etc/laptop-mode/conf.d/wireless-power.conf 31961
usr/bin/logger 31960
etc/laptop-mode/laptop-mode.conf 31959
lib/modules/3.10-3-686-pae/kernel/sound/pci/snd-intel8x0.ko 31958
lib/modules/3.12-1-686-pae/kernel/sound/pci/snd-intel8x0.ko 31958
usr/bin/flock 31956
lib/udev/write_net_rules 31954
lib/udev/rule_generator.functions 31953
......@@ -731,42 +731,42 @@ lib/libip4tc.so.0.0.0 31862
lib/libxtables.so.4.0.0 31861
sbin/ip6tables-multi 31860
lib/libip6tc.so.0.0.0 31859
lib/modules/3.10-3-686-pae/kernel/net/netfilter/x_tables.ko 31858
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/ip_tables.ko 31857
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko 31856
lib/modules/3.10-3-686-pae/kernel/net/netfilter/nf_conntrack.ko 31855
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko 31854
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/nf_nat.ko 31853
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/iptable_nat.ko 31852
lib/modules/3.12-1-686-pae/kernel/net/netfilter/x_tables.ko 31858
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/ip_tables.ko 31857
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko 31856
lib/modules/3.12-1-686-pae/kernel/net/netfilter/nf_conntrack.ko 31855
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko 31854
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/nf_nat.ko 31853
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/iptable_nat.ko 31852
etc/protocols 31851
lib/xtables/libipt_REDIRECT.so 31850
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko 31849
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/iptable_filter.ko 31848
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko 31849
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/iptable_filter.ko 31848
lib/xtables/libxt_state.so 31847
lib/xtables/libxt_standard.so 31846
lib/xtables/libxt_tcp.so 31845
lib/xtables/libxt_owner.so 31844
lib/modules/3.10-3-686-pae/kernel/net/netfilter/xt_owner.ko 31843
lib/modules/3.12-1-686-pae/kernel/net/netfilter/xt_owner.ko 31843
lib/xtables/libxt_multiport.so 31842
lib/modules/3.10-3-686-pae/kernel/net/netfilter/xt_multiport.ko 31841
lib/modules/3.12-1-686-pae/kernel/net/netfilter/xt_multiport.ko 31841
lib/xtables/libxt_udp.so 31840
etc/services 31839
lib/xtables/libipt_LOG.so 31838
lib/xtables/libipt_REJECT.so 31837
lib/modules/3.10-3-686-pae/kernel/net/netfilter/xt_state.ko 31836
lib/modules/3.10-3-686-pae/kernel/net/netfilter/xt_tcpudp.ko 31835
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/ipt_LOG.ko 31834
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/ipt_REJECT.ko 31833
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/ip6_tables.ko 31832
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/ip6table_filter.ko 31831
lib/modules/3.12-1-686-pae/kernel/net/netfilter/xt_state.ko 31836
lib/modules/3.12-1-686-pae/kernel/net/netfilter/xt_tcpudp.ko 31835
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/ipt_LOG.ko 31834
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/ipt_REJECT.ko 31833
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/ip6_tables.ko 31832
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/ip6table_filter.ko 31831
lib/xtables/libip6t_LOG.so 31830
lib/xtables/libip6t_REJECT.so 31829
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/nf_defrag_ipv6.ko 31828
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko 31827
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/ip6t_LOG.ko 31826
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/ip6t_REJECT.ko 31825
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/nf_defrag_ipv6.ko 31828
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko 31827
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/ip6t_LOG.ko 31826
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/ip6t_REJECT.ko 31825
etc/init.d/fuse 31824
lib/modules/3.10-3-686-pae/kernel/fs/fuse/fuse.ko 31823
lib/modules/3.12-1-686-pae/kernel/fs/fuse/fuse.ko 31823
etc/init.d/kbd 31820
etc/kbd/config 31819
etc/environment 31818
......@@ -912,7 +912,7 @@ etc/default/rsync 31673
etc/init.d/saned 31672
etc/default/saned 31671
etc/init.d/spice-vdagent 31670
lib/modules/3.10-3-686-pae/kernel/drivers/input/misc/uinput.ko 31669
lib/modules/3.12-1-686-pae/kernel/drivers/input/misc/uinput.ko 31669
usr/sbin/spice-vdagentd 31668
etc/init.d/kexec-load 31667
etc/init.d/tails-kexec 31666
......@@ -1294,7 +1294,7 @@ usr/lib/at-spi/at-spi-registryd 31285
usr/lib/libspi.so.0.10.11 31284
usr/lib/gnome-settings-daemon/gnome-settings-daemon 31283
usr/bin/spice-vdagent 31282
lib/modules/3.10-3-686-pae/kernel/drivers/input/joydev.ko 31281
lib/modules/3.12-1-686-pae/kernel/drivers/input/joydev.ko 31281
usr/lib/libbonobo-2.so.0.0.0 31280
usr/lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin 31279
usr/lib/libbonobo-activation.so.4.0.0 31278
......
......@@ -75,6 +75,22 @@ Package: libmethod-signatures-simple-perl
Pin: origin backports.debian.org
Pin-Priority: 999
Package: libnspr4
Pin: origin backports.debian.org
Pin-Priority: 1010
Package: libnspr4-0d
Pin: origin backports.debian.org
Pin-Priority: 1010
Package: libnss3
Pin: origin backports.debian.org
Pin-Priority: 1010
Package: libnss3-1d
Pin: origin backports.debian.org
Pin-Priority: 1010
Package: libpcsclite1
Pin: origin backports.debian.org
Pin-Priority: 999
......@@ -87,6 +103,14 @@ Package: libregexp-common-perl
Pin: release o=Debian,n=wheezy
Pin-Priority: 999
Package: libsqlite3-0
Pin: origin backports.debian.org
Pin-Priority: 1010
Package: sqlite3
Pin: origin backports.debian.org
Pin-Priority: 1010
Package: libstring-errf-perl
Pin: origin backports.debian.org
Pin-Priority: 999
......@@ -95,10 +119,6 @@ Package: libstring-formatter-perl
Pin: origin backports.debian.org
Pin-Priority: 999
Package: libsqlite3-0
Pin: origin mozilla.debian.net
Pin-Priority: 999
Package: libsys-statistics-linux-perl
Pin: origin backports.debian.org
Pin-Priority: 999
......@@ -239,6 +259,10 @@ Package: linux-base
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-compiler-gcc-4.8-x86
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-486
Pin: release o=Debian,a=testing
Pin-Priority: 999
......@@ -251,19 +275,19 @@ Package: linux-headers-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.10-3-common
Package: linux-headers-3.12-1-common
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.10-3-486
Package: linux-headers-3.12-1-486
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.10-3-686-pae
Package: linux-headers-3.12-1-686-pae
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.10-3-amd64
Package: linux-headers-3.12-1-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
......@@ -279,20 +303,20 @@ Package: linux-image-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.10-3-486
Package: linux-image-3.12-1-486
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.10-3-686-pae
Package: linux-image-3.12-1-686-pae
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.10-3-amd64
Package: linux-image-3.12-1-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-kbuild-3.10
Pin: release o=Debian,a=testing
Package: linux-kbuild-3.12
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: laptop-mode-tools
......@@ -303,10 +327,6 @@ Package: spice-vdagent
Pin: release o=Debian,n=wheezy
Pin-Priority: 999
Package: sqlite3
Pin: origin mozilla.debian.net
Pin-Priority: 999
Package: tor
Pin: origin deb.torproject.org
Pin-Priority: 999
......
......@@ -4,7 +4,7 @@
set -e
apt-get --yes install xvfb
TOR_SOCKS_HOST='127.0.0.1' TOR_SOCKS_PORT='9151' xvfb-run iceweasel -CreateProfile default
TOR_SOCKS_HOST='127.0.0.1' TOR_SOCKS_PORT='9151' xvfb-run /usr/bin/iceweasel -CreateProfile default
mv ~/.mozilla/firefox/*.default ~/.mozilla/firefox/default
sed -i "s@Path=.*\.default@Path=default@" ~/.mozilla/firefox/profiles.ini
mv ~/.mozilla /etc/skel
......
......@@ -173,11 +173,6 @@ tor_cert_valid_after() {
${TOR_LOG} | tail -n 1
}
tor_bootstrap_progress() {
grep -o "\[notice\] Bootstrapped [[:digit:]]\+%:" ${TOR_LOG} | \
tail -n1 | sed "s|\[notice\] Bootstrapped \([[:digit:]]\+\)%:|\1|"
}
tor_cert_lifetime_invalid() {
# To be sure that we only grep relevant information, we
# should delete the log when Tor is started, which we do
......
#! /bin/sh
# Run only when the interface is not "lo":
if [ $1 = "lo" ]; then
exit 0
fi
# Run whenever an interface gets "up", not otherwise:
if [ $2 != "up" ]; then
exit 0
fi
# There's nothing to do if Iceweasel is already running
if pgrep -u "${LIVE_USERNAME}" firefox-bin 1>/dev/null 2>&1; then
exit 0
fi
# Get LIVE_USERNAME
. /etc/live/config.d/username.conf
export DISPLAY=':0.0'
export XAUTHORITY="`echo /var/run/gdm3/auth-for-${LIVE_USERNAME}-*/database`"
export XDG_DATA_DIRS=/usr/share/gnome:/usr/share/gdm/:/usr/local/share/:/usr/share/
export MONKEYSPHERE_VALIDATION_AGENT_SOCKET='http://127.0.0.1:6136'
# Get GTK_IM_MODULE, QT_IM_MODULE and XMODIFIERS
if [ -e "/home/${LIVE_USERNAME}/.im_environment" ] ; then
. "/home/${LIVE_USERNAME}/.im_environment"
if [ -n "${XMODIFIERS}" ] ; then
export XMODIFIERS
fi
if [ -n "${GTK_IM_MODULE}" ] ; then
export GTK_IM_MODULE
fi
if [ -n "${QT_IM_MODULE}" ] ; then
export QT_IM_MODULE
fi
fi
exec /bin/su -c iceweasel "${LIVE_USERNAME}" &
#! /bin/sh
# Run only when the interface is not "lo":
if [ $1 = "lo" ]; then
exit 0
fi
# Run whenever an interface gets "up", not otherwise:
if [ $2 != "up" ]; then
exit 0
fi
# Get LANG
. /etc/default/locale
export LANG
# Initialize gettext support
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
tor_has_bootstrapped() {
sudo -n -u debian-tor /usr/local/sbin/tor-has-bootstrapped
}
while ! tor_has_bootstrapped; do
sleep 1
done
/usr/local/sbin/tails-notify-user \
"`gettext \"Tor is ready\"`" \
"`gettext \"You can now access the Internet.\"`"
......@@ -19,18 +19,24 @@ case "$LANGPREFIX" in
ko)
PREFLIST='[hangul,pinyin,anthy,bopomofo]'
;;
*)
zh)
PREFLIST='[pinyin,anthy,hangul,bopomofo]'
;;
*)
PREFLIST=
;;
esac
# Configure enabled input methods and their preferred order
gconftool-2 --type=list --list-type=string --set \
/desktop/ibus/general/preload_engines "$PREFLIST"
if [ -n "$PREFLIST" ]; then
# Configure enabled input methods and their preferred order
gconftool-2 --type=list --list-type=string --set \
/desktop/ibus/general/preload_engines "$PREFLIST"
# Start the IBus input method daemon
/usr/bin/ibus-daemon --daemonize --xim
# Start the IBus input method daemon
/usr/bin/ibus-daemon --daemonize --xim
# Export environment variables to enable use of IBus
export GTK_IM_MODULE='ibus'
export QT_IM_MODULE='ibus'
export XMODIFIERS='@im=ibus'
# Export environment variables to enable use of IBus
export GTK_IM_MODULE='ibus'
export QT_IM_MODULE='ibus'
export XMODIFIERS='@im=ibus'
fi
HTP_POOL_PAL="boum.org,chavez.indymedia.org,db.debian.org,epic.org,mail.riseup.net,sarava.org,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
HTP_POOL_NEUTRAL="cve.mitre.org,en.wikipedia.org,lkml.org,thepiratebay.org,www.apache.org,www.centos.org,www.democracynow.org,www.duckduckgo.com,www.gnu.org,www.kernel.org,www.mozilla.org,www.stackexchange.com,www.startpage.com,www.xkcd.com"
HTP_POOL_FOE="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,www.myspace.com,www.paypal.com,www.rsa.com,www.sony.com"
HTTP_USER_AGENT="$(/usr/local/bin/getTorbuttonUserAgent)"
HTTP_USER_AGENT="$(/usr/local/bin/getTorBrowserUserAgent)"
......@@ -40,8 +40,14 @@ pref("browser.safebrowsing.enabled", false);
pref("browser.safebrowsing.malware.enabled", false);
pref("browser.download.manager.scanWhenDone", false); // prevents AV remote reporting of downloads
pref("extensions.ui.lastCategory", "addons://list/extension");
pref("datareporting.healthreport.service.enabled", false);
pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set
pref("datareporting.healthreport.uploadEnabled", false);
pref("datareporting.policy.dataSubmissionEnabled", false);
pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched
pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync
pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers
pref("services.sync.engine.addons", false);
pref("services.sync.engine.tabs", false);
// Fingerprinting
pref("webgl.min_capability_mode", true);
......@@ -127,7 +133,9 @@ pref("xpinstall.whitelist.add.36", "");
pref("keyword.URL", "https://startpage.com/do/search?q=");
// Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW?
// Nvida cards also experience crashes without the second pref set to disabled
pref("gfx.direct2d.disabled", true);
pref("layers.acceleration.disabled", true);
// Version placeholder
pref("torbrowser.version", "UNKNOWN");
browser.search.defaultenginename=Startpage HTTPS - Espanol
browser.search.selectedEngine=Startpage HTTPS - Espanol
browser.startup.homepage=https://tails.boum.org/news/index.es.html
browser.startup.homepage=https://tails.boum.org/news/
spellchecker.dictionary=es_ES
amnesia ALL = (debian-tor) NOPASSWD: /usr/local/sbin/tor-has-bootstrapped
[Desktop Entry]
Name=tails-upgrade-frontend
GenericName=check available Tails upgrades
Comment=check available Tails upgrades
Exec=/usr/local/bin/tails-upgrade-frontend-wrapper
Terminal=false
Type=Application
Categories=GNOME;X-GNOME-PersonalSettings;
NoDisplay=true
MimeType=application/x-tails-upgrade-frontend;
......@@ -5,28 +5,22 @@ use strict;
use 5.10.0;
use Fatal qw( open close );
sub getTorbuttonUserAgent {
sub getTorBrowserUserAgent {
my $file = shift;
my $ua;
open (my $in, "<", $file);
while (my $line = <$in>) {
chomp $line;
if ($line =~ m/^pref\("extensions\.torbutton\.useragent_override",$/) {
my $next_line = <$in>;
if (($ua) = ($next_line =~ m/^ *"(.*)"\);$/)) {
last;
}
else {
die "Unparseable file.";
}
if (($ua) = ($line =~ m/^pref[(]"general[.]useragent[.]override", "(.*)"[)];$/)) {
last;