Skip to content
GitLab
Menu
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
b3940223
Commit
b3940223
authored
May 06, 2012
by
Tails developers
Browse files
Merge branch 'devel' into feature/torsocks
parents
6b503d09
a155a928
Changes
423
Expand all
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
b3940223
...
...
@@ -2,6 +2,7 @@
*.mo~
*.po~
*.pot~
*.swp
/*.buildlog
/*.img
/*.iso
...
...
config/amnesia
View file @
b3940223
...
...
@@ -13,7 +13,7 @@
# Base for the string that will be passed to "lb config --bootappend-live"
# FIXME: see [[bugs/sdmem_on_eject_broken_for_CD]] for explanation why we
# need to set block.events_dfl_poll_msecs
AMNESIA_APPEND
=
"
noswap
live-media=removable nopersistent noprompt quiet timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash nox11autologin"
AMNESIA_APPEND
=
"live-media=removable nopersistent noprompt quiet timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash nox11autologin"
### You should not have to change anything bellow this line ####################
...
...
config/chroot_apt/preferences
View file @
b3940223
...
...
@@ -62,6 +62,10 @@ Package: live-config
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: live-config-sysvinit
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: macchanger
Pin: release o=Debian,a=unstable
Pin-Priority: 999
...
...
@@ -303,6 +307,10 @@ Package: *
Pin: origin mozilla.debian.net
Pin-Priority: 991
Package: *
Pin: release o=Debian,n=squeeze-updates
Pin-Priority: 990
Package: *
Pin: release o=Debian,n=squeeze
Pin-Priority: 900
...
...
config/chroot_local-hooks/03-noswap
deleted
100755 → 0
View file @
6b503d09
#!/bin/sh
# We don't want to swap to the local machine
rm
-f
/usr/share/initramfs-tools/scripts/live-bottom/13swap
config/chroot_local-hooks/12-remove_unwanted_iceweasel_searchplugins
View file @
b3940223
...
...
@@ -4,9 +4,9 @@
echo
"removing unwanted iceweasel search plugins"
rm
-f
/
usr/share
/iceweasel/
distribution/
searchplugins/common/duckduckgo.xml
rm
-f
/
usr/share
/iceweasel/
distribution/
searchplugins/locale/
*
/amazon
*
.xml
rm
-f
/
usr/share
/iceweasel/
distribution/
searchplugins/locale/
*
/answers.xml
rm
-f
/
usr/share
/iceweasel/
distribution/
searchplugins/locale/
*
/bing
*
.xml
rm
-f
/
usr/share
/iceweasel/
distribution/
searchplugins/locale/
*
/eBay
*
.xml
rm
-f
/
usr/share
/iceweasel/
distribution/
searchplugins/locale/
*
/yahoo
*
.xml
rm
-f
/
etc
/iceweasel/searchplugins/common/duckduckgo.xml
rm
-f
/
etc
/iceweasel/searchplugins/locale/
*
/amazon
*
.xml
rm
-f
/
etc
/iceweasel/searchplugins/locale/
*
/answers.xml
rm
-f
/
etc
/iceweasel/searchplugins/locale/
*
/bing
*
.xml
rm
-f
/
etc
/iceweasel/searchplugins/locale/
*
/eBay
*
.xml
rm
-f
/
etc
/iceweasel/searchplugins/locale/
*
/yahoo
*
.xml
config/chroot_local-hooks/99-dedup_usr_share_doc
0 → 100755
View file @
b3940223
#!/bin/sh
/usr/bin/hardlink
-t
/usr/share/doc
apt-get
--yes
purge hardlink
config/chroot_local-includes/etc/iceweasel/profile/adblockplus/patterns.ini
View file @
b3940223
This diff is collapsed.
Click to expand it.
config/chroot_local-includes/
usr/share
/iceweasel/
distribution/
searchplugins/locale/de/startpage-https-de.xml
→
config/chroot_local-includes/
etc
/iceweasel/searchplugins/locale/de/startpage-https-de.xml
View file @
b3940223
File moved
config/chroot_local-includes/
usr/share
/iceweasel/
distribution/
searchplugins/locale/es/startpage-https-es.xml
→
config/chroot_local-includes/
etc
/iceweasel/searchplugins/locale/es/startpage-https-es.xml
View file @
b3940223
File moved
config/chroot_local-includes/
usr/share
/iceweasel/
distribution/
searchplugins/locale/fr/startpage-https-fr.xml
→
config/chroot_local-includes/
etc
/iceweasel/searchplugins/locale/fr/startpage-https-fr.xml
View file @
b3940223
File moved
config/chroot_local-includes/
usr/share
/iceweasel/
distribution/
searchplugins/locale/it/startpage-https-it.xml
→
config/chroot_local-includes/
etc
/iceweasel/searchplugins/locale/it/startpage-https-it.xml
View file @
b3940223
File moved
config/chroot_local-includes/
usr/share
/iceweasel/
distribution/
searchplugins/locale/pt/startpage-https-pt.xml
→
config/chroot_local-includes/
etc
/iceweasel/searchplugins/locale/pt/startpage-https-pt.xml
View file @
b3940223
File moved
config/chroot_local-includes/etc/live/config.d/user-default-groups.conf
0 → 100644
View file @
b3940223
LIVE_USER_DEFAULT_GROUPS
=
"audio cdrom dialout floppy video plugdev netdev powerdev fuse debian-tor scanner lp lpadmin vboxsf"
config/chroot_local-includes/etc/sudoers.d/zzz_i2p
0 → 100644
View file @
b3940223
amnesia ALL = NOPASSWD: /etc/init.d/i2p
config/chroot_local-includes/etc/sudoers.d/zzz_tails-start-i2p
deleted
100644 → 0
View file @
6b503d09
amnesia ALL = NOPASSWD: /usr/local/bin/tails-start-i2p
config/chroot_local-includes/usr/local/bin/tails-documentation
View file @
b3940223
...
...
@@ -17,4 +17,4 @@ else
FILE
=
"
${
PAGE
}
.html"
fi
exec
iceweas
el
"file://
${
WIKI_ROOT
}
/
${
FILE
}
"
exec
y
el
p
"file://
${
WIKI_ROOT
}
/
${
FILE
}
"
config/chroot_local-includes/usr/share/locale/fr/LC_MESSAGES/tails-htp-notify-user.po
View file @
b3940223
...
...
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-30 11:18+0100\n"
"PO-Revision-Date: 201
0-12-23 15:5
2+0
1
00\n"
"PO-Revision-Date: 201
2-04-13 14:2
2+0
2
00\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
...
...
@@ -22,13 +22,12 @@ msgid "Synchronizing the system's clock"
msgstr "Mise à jour de l'horloge système..."
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:56
#, fuzzy
msgid ""
"Tor needs an accurate clock to work properly, especially for Hidden "
"Services. Please wait..."
msgstr ""
"Tor a besoin d'une horloge bien réglée pour fonctionner correctement
.
"
"Veuillez patienter..."
"Tor a besoin d'une horloge bien réglée pour fonctionner correctement
, en\n
"
"
particulier pour les services cachés.
Veuillez patienter..."
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:103
msgid "Failed to synchronize the clock!"
...
...
config/chroot_local-packageslists/tails-common.list
View file @
b3940223
...
...
@@ -52,7 +52,6 @@ libnotify-bin
audacity
barry-util
cups
cryptkeeper
cryptsetup
rsync
aircrack-ng
...
...
@@ -92,6 +91,7 @@ gstreamer0.10-ffmpeg
gstreamer0.10-plugins-base
gstreamer0.10-plugins-good
gstreamer0.10-plugins-ugly
hardlink
haveged
# needed by laptop-mode-tools to spin-down hard drives
hdparm
...
...
@@ -152,6 +152,7 @@ polipo
ppp
pwgen
resolvconf
rfkill
sane-utils
scribus-ng
seahorse
...
...
@@ -252,6 +253,8 @@ ttf-thai-tlwg
brasero
### Accessibility
## mouse accessibility enhancements
mousetweaks
## screen magnifier
gnome-mag
## text-to-speech
...
...
@@ -290,6 +293,9 @@ gnome-theme-xpluna
gnome-xp-icon-theme
xp-cursor-theme
### Needed by virtualbox-guest-utils
pciutils
### Spice and QXL
spice-vdagent
xserver-xorg-video-qxl
config/chroot_local-patches/unmute_alsa_channels.patch
View file @
b3940223
--- chroot.orig/etc/init.d/alsa-utils 2010-10-04 18:14:10.000000000 +0000
+++ chroot/etc/init.d/alsa-utils 2012-03-12 13:49:11.815997232 +0000
@@ -206,
6
+206,
9
@@
@@ -206,
5
+206,
10
@@
# On MacBookPro5,3 and later models (See Bug#597791)
unmute_and_set_level "Front Speaker" "80%"
+ # On MacBook5,2 models (See Bug#602973)
+ unmute_and_set_level "LFE" "80%"
+ # On Intel 82801H (See Bug#603550)
+ unmute_and_set_level "Speaker" "80%"
...
...
config/chroot_local-preseed/user
deleted
100644 → 0
View file @
6b503d09
debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse debian-tor scanner lp lpadmin vboxsf
\ No newline at end of file
Prev
1
2
3
4
5
…
22
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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