Commit 3e6c6eb7 authored by Tails developers's avatar Tails developers
Browse files

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

parents fb2b19e4 38e1e310
......@@ -15,6 +15,9 @@ case "$1" in
start)
echo "KERNEL_IMAGE=\"$(/usr/local/bin/tails-get-bootinfo kernel)\"" >> "$KEXEC_CONF"
echo "INITRD=\"$(/usr/local/bin/tails-get-bootinfo initrd)\"" >> "$KEXEC_CONF"
if grep -qw debug=wipemem /proc/cmdline; then
echo 'APPEND="${APPEND} sdmemdebug=1"' >> "$KEXEC_CONF"
fi
;;
*)
echo "Usage: $0 start" >&2
......
#!/usr/bin/python
# NB: this program is subject to the system's per-process memory limits.
string = ""
while True:
string = string + "wipe_didnt_work\n"
......@@ -26,11 +26,17 @@ esac
if [ -n "${sdmem}" ] ; then
tweak_sysctl
if [ -n "${sdmemopts}" ] ; then
for i in $(seq 0 31) ; do /usr/bin/sdmem "-${sdmemopts}" & done
else
for i in $(seq 0 31) ; do /usr/bin/sdmem -v & done
if [ -z "${sdmemopts}" ] ; then
sdmemopts="v"
fi
for i in $(seq 0 30) ; do /usr/bin/sdmem "-${sdmemopts}" & done
# Wait for at least one sdmem job to complete.
/usr/bin/sdmem "-${sdmemopts}"
fi
if [ "${sdmemdebug}" = 1 ] ; then
echo "Going to sleep 10 minutes. Happy dumping!"
sleep 600
fi
case "${sdmem}" in
......
......@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2011-10-15 17:34+0300\n"
"PO-Revision-Date: 2011-10-15 17:56+0200\n"
"POT-Creation-Date: 2011-11-11 15:08+0100\n"
"PO-Revision-Date: 2011-11-11 15:09+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -17,5 +17,5 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: outside any tag (error?)
msgid "October 16, 2011"
msgstr "16 octobre 2011"
msgid "November 11, 2011"
msgstr "11 novembre 2011"
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