Commit 323cb83e authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' into testing

parents bdf9b143 5f662028
#!/usr/bin/perl
# Configuration file for ikiwiki to build amnesia's documentation wiki.
use IkiWiki::Setup::Standard {
wikiname => "The Amnesic Incognito Live System",
adminemail => 'amnesia@boum.org',
srcdir => "wiki/src",
destdir => "config/binary_local-includes/doc/amnesia/wiki",
discussion => 0,
exclude => qr/\/discussion/,
locale => 'en_US.UTF-8',
verbose => 1,
syslog => 0,
userdir => "",
usedirs => 0,
prefix_directives => 1,
add_plugins => [qw{favicon html map remove rename passwordauth mirrorlist po shortcut sidebar tag toc typography comments meta img editpage recentchanges anonok search po}],
disable_plugins => [qw{openid httpauth signinedit}],
rcs => 'git',
gitorigin_branch => '',
historyurl => 'http://git.immerda.ch/?p=amnesia.git;a=history;f=wiki/src/[[file]]',
diffurl => 'http://git.immerda.ch/?p=amnesia.git;a=blobdiff;f=wiki/src/[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]',
rss => 1,
atom => 1,
cgiurl => "http://localhost/amnesia/wiki",
url => "file:///live/image/doc/amnesia/wiki",
allow_symlinks_before_srcdir => 1,
tagbase => 'tags',
mirrorlist => { 'amnesia.boum.org' => 'https://amnesia.boum.org/ikiwiki.cgi' },
mirrorlist_use_cgi => 1,
comments_pagespec => "forum/*",
# po plugin
po_master_language => { 'code' => 'en', 'name' => 'English' },
po_slave_languages => {
'ca' => 'Catalan',
'fr' => 'Français',
'es' => 'Español',
'de' => 'Deutsch',
},
po_translatable_pages => '(about or bug_reporting or bugs or build or chat or customize or download or features or found_a_problem or git or GnuPG_key or index or news or security or security/* or sidebar or stay_tuned or support or support/* or talk-dev or talk-users or tarball or todo or torrents or upgrade or wishlist) and !security/audits and !security/audits/*',
po_link_to => 'current',
}
......@@ -6,14 +6,19 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2011-03-12 09:32-0800\n"
"PO-Revision-Date: 2011-03-12 18:37+0100\n"
"POT-Creation-Date: 2011-03-25 12:37+0100\n"
"PO-Revision-Date: 2011-03-25 12:37+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING\n"
"Language: \n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"GnuPG key pairs\"]]\n"
msgstr "[[!meta title=\"Paires de clés GnuPG\"]]\n"
#. type: Plain text
msgid "Tails developers maintain several OpenPGP key pairs."
......@@ -32,7 +37,7 @@ msgstr "Clé de la liste de discussion\n"
#. type: Title -
#, no-wrap
msgid "Purpose\n"
msgstr "But\n"
msgstr "Usage prévu\n"
#. type: Title ###
#, no-wrap
......@@ -195,12 +200,11 @@ msgstr ""
#. type: Plain text
msgid ""
"- [download it from this website](https://amnesia.boum.org/amnesia.asc) - "
"fetch it from your favourite keyserver."
"- download it from this website: [[!tails_website amnesia.asc]] - fetch it "
"from your favourite keyserver."
msgstr ""
"[la télécharger ici](https://amnesia.boum.org/amnesia.asc) - la récupérer "
"sur\n"
"votre serveur de clefs favori."
"- la télécharger depuis ce site : [[!tails_website amnesia.asc]]\n"
"- la récupérer sur votre serveur de clefs favori."
#~ msgid "\tSubject: send key!\n"
#~ msgstr " Sujet : send key!\n"
......
[[!meta title="GnuPG key pairs"]]
Tails developers maintain several OpenPGP key pairs.
[[!toc levels=2]]
......@@ -86,5 +88,5 @@ How to get the public key?
There are multiple ways to get this OpenPGP public key:
- [download it from this website](https://amnesia.boum.org/amnesia.asc)
- download it from this website: [[!tails_website amnesia.asc]]
- fetch it from your favourite keyserver.
......@@ -23,6 +23,8 @@ preserving your privacy and anonymity:
<p>It has many other [[features]].</p>
<p>Technical details can be found in the [[design documentation|contribute/design]].</p>
</div> <!-- #intro -->
<div class="container">
......
......@@ -6,14 +6,19 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2011-01-07 10:08-0800\n"
"PO-Revision-Date: 2011-03-02 01:40+0100\n"
"POT-Creation-Date: 2011-03-25 12:39+0100\n"
"PO-Revision-Date: 2011-03-25 12:39+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING\n"
"Language: \n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Bug reporting\"]]\n"
msgstr "[[!meta title=\"Rapporter un bug\"]]\n"
#. type: Plain text
#, no-wrap
......
[[!meta title="Bug reporting"]]
<div id="intro">
<p>
......
Thats not correct everything is fine...
http://dl.amnesia.boum.org/tails/stable/ ---> points to
https://archive.torproject.org/amnesia.boum.org/tails/stable/
and there is the subdirectory with the latest release and everything is downloadable per https.
https://archive.torproject.org/amnesia.boum.org/tails/stable/tails-i386-lenny-0.6.2/
Since 0.5 every published Tails i386 ISO image is a hybrid one:
- it can be burnt to a CD;
- it also contains a full disk image (including partition table) and
can thus be copied (using `dd`) to a USB stick; the USB stick's
content is lost in the operation.
Successful tests:
* boot the resulting `test.iso` as a normal optical drive in
VirtualBox
* boot the resulting `test.iso` as a KVM hard disk
* convert the resulting `test.iso`, posing as a HDD image, into the
native VirtualBox disk format, using `VBoxManage
convertfromraw -format VDI test.iso test.vdi`, then boot the
resulting `test.vdi` disk image in VirtualBox
* `dd` the hybrid `test.iso` to a USB stick and boot it on
a USB-boot-enabled computer.
Notes:
* the partition number may need to be 4, in order to be compatible
with the BIOSes supporting only USB-Zip;
[reference](http://syslinux.zytor.com/archives/2009-May/012380.html)
* the partition type may need to be `1c`, i.e. hidden FAT32 LBA;
[reference](http://syslinux.zytor.com/archives/2009-May/012384.html)
* boot failures were experimented when testing without the `-entry
4 -type 1c` options.
Conclusion: this is a nice way to get bootable USB images for almost
free.
......@@ -50,7 +50,7 @@ SquashFS files order
--------------------
Build ISO images, profile them and update `squashfs.order` in the Git
repository. The rebuild images.
repository. Then rebuild images.
See [[todo/improve_boot_time_on_cd]] for details.
......
......@@ -6,14 +6,19 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2011-03-19 10:50-0600\n"
"PO-Revision-Date: 2011-03-02 01:40+0100\n"
"POT-Creation-Date: 2011-03-25 12:46+0100\n"
"PO-Revision-Date: 2011-03-25 12:47+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODING\n"
"Language: \n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Features\"]]\n"
msgstr "[[!meta title=\"Fonctionnalités\"]]\n"
#. type: Plain text
#, no-wrap
......@@ -274,12 +279,12 @@ msgstr "Multilingues\n"
#. type: Plain text
msgid ""
"One can choose at boot time between the following languages: Arabic, "
"Chinese, English, French, Italian, German, Portuguese, Russian and Spanish "
"Chinese, English, French, Italian, German, Portuguese and Spanish "
"(Castellano)."
msgstr ""
"Il est possible de choisir, au démarrage, entre les langues suivantes :\n"
"allemand, anglais, arabe, chinois, espagnol (castillan), français, italien,\n"
"portuguais, et russe"
"allemand, anglais, arabe, chinois, espagnol (castillan), français, italien et\n"
"portuguais."
#. type: Plain text
msgid ""
......
[[!meta title="Features"]]
*The Amnesic Incognito Live System* ([Live
CD](http://en.wikipedia.org/wiki/Live_CD), [Live
USB](http://en.wikipedia.org/wiki/Live_USB)) is aimed at preserving
......@@ -89,8 +91,8 @@ Multilingual support
====================
One can choose at boot time between the following languages:
Arabic, Chinese, English, French, Italian, German, Portuguese,
Russian and Spanish (Castellano).
Arabic, Chinese, English, French, Italian, German, Portuguese
and Spanish (Castellano).
Some of these languages could not be thoroughly tested as we don't
speak every language in the world. If you find issues using one of the
......
[[!tag todo/research]]
[[!tag todo/code]]
[[!toc levels=2]]
Rationale
=========
An automated build and test environment would be pretty useful to
ensure a few facts:
......@@ -11,7 +16,25 @@ ensure a few facts:
modern high-end hardware (8GB RAM is needed in order to build
a Tails image in tmpfs).
Resources:
Left to do
==========
1. notification (sent to whom?) when a build fails (repeatedly?)
2. allow developers to have their personal branch(es?) autobuilt as
well => help developers test their code *before* pushing it to the
`devel` branch
3. allow developers to test an autobuilt image in a VM over VNC or
similar
4. automated runtime tests
Already done
============
The `devel` and `testing` branches are automatically built in a
[buildbot](http://buildbot.net/) instance.
Resources
=========
- <http://live.debian.net/gitweb/?p=live-autobuild.git> is currently
used to build "official" daily Debian Live images
......@@ -31,4 +54,4 @@ Resources:
- Mozilla's [Automation QA team](http://quality.mozilla.org/teams/automation/)
- [Sikuli](https://launchpad.net/sikuli), visual technology to automate
graphical user interfaces (GUI) using images (screenshots), used by Ubuntu,
even has an IDE!
even has an IDE! It is now part of Debian ([[!debbug 578125]]).
Tails ships i2p 0.80 while 0.84 is released.
See [[Tails I2P design page|contribute/design/I2P]] for details about
how it shall be reviewed and upgrade steps.
[[!tag todo/research]]
Allow easily installing Tails to a USB storage device
[[!meta title="USB install and upgrade"]]
* from a running (CD or USB) amnesia system
* from another OS, using a downloaded ISO image
[[!toc levels=3]]
[[!toc levels=2]]
specification
Specification
=============
* allow creating an encrypted persistence storage space (e.g. a second
encrypted partition, or a file-backed encrypted FS) or *at least*
leave room for it
* allow non-destructively upgrading the live system only, not touching
the other partitions (use the iso + grub trick ? tar image
+ cp?)
One should be able to easily install Tails to a USB storage device:
research
========
* by cloning an existing Tails system that is running from CD or USB;
* from another operating system, using a downloaded ISO image.
[[!tag todo/research]]
booting methods
---------------
Moreover, at installation time, one should be allowed to setup an
encrypted storage space that can be used by the [[upcoming persistence
feature|todo/persistence]]; earliest versions of the installation
program must at least leave room for it so that a later version can be
make use of it. Whether this storage space should better be a second
encrypted partition or a file-backed encrypted FS shall be researched.
### syslinux hybrid image
One should also be able to easily and non-destructively upgrade a
given Tails system installed on a USB storage device.
Non-destructively means not touching any partition or file other than
the ones managed by the Tails installation system.
Since 0.5 every Tails ISO image we ship now is a persistent one:
- it can be burnt to a CD;
- it also contains a full disk image (including partition table) and
can thus be copied (using `dd`) to a USB stick; the USB stick's
content is lost in the operation.
Successful tests:
* boot the resulting `test.iso` as a normal optical drive in
VirtualBox
* boot the resulting `test.iso` as a KVM hard disk
* convert the resulting `test.iso`, posing as a HDD image, into the
native VirtualBox disk format, using `VBoxManage
convertfromraw -format VDI test.iso test.vdi`, then boot the
resulting `test.vdi` disk image in VirtualBox
* `dd` the hybrid `test.iso` to a USB stick and boot it on
a USB-boot-enabled computer.
Research
========
Notes:
[[!tag todo/research]]
* the partition number may need to be 4, in order to be compatible
with the BIOSes supporting only USB-Zip;
[reference](http://syslinux.zytor.com/archives/2009-May/012380.html)
* the partition type may need to be `1c`, i.e. hidden FAT32 LBA;
[reference](http://syslinux.zytor.com/archives/2009-May/012384.html)
* boot failures were experimented when testing without the `-entry
4 -type 1c` options.
Booting methods
---------------
Conclusion: this is a nice way to get bootable USB images for almost
free.
Tails [[ships hybrid ISO images|contribute/design/hybrid_ISO]]. dd'ing
such a file to a USB stick produces a bootable Tails system but it
overwrites any previously existing partition table. This method is
therefore not suitable for us since it does not satisfy the
"non-destructive upgrade process" requirement.
### misc
Two alternatives booting methods have been investigated:
* apart when using a setup able to boot an ISO image, one needs to
copy the ISO's `live/` directory to the destination partition, and
setup a bootloader there
* use grml's
[patches to live-initramfs](http://git.grml.org/?p=live-initramfs-grml.git;a=tree;f=debian/patches)
to support directly booting an ISO image... merged in upstream Git,
commit 6458a8862db68. Another of their patches (namely
`07_support_findiso.dpatch`) adds support for the
`findiso` boot parameter, which is needed for easy usage; this one
has not been applied upstream yet; does it respect the
`live-media=removable` boot parameter?
* Philip Hands' solution proposed on [[!debbug 534887]]
uses extlinux chainloading the image's own bootloader
1. **Boot ISO file**: Setup a bootloader on the USB stick that is able
to boot an ISO image dropped into the right directory of it.
2. **Copy ISO's content**: Copy needed files (mainly the `live/`
directory) from the ISO filesystem to the destination partition,
and setup a bootloader that uses files in that directory. The end
result is more or less equivalent to dd'ing the ISO image to the
USB stick, but the process can be made in a non-destructive way.
### Grub2
......@@ -154,9 +127,24 @@ Resources:
with a snippet for `grub.d` to automate booting ISO images from
Grub2, using syslinux' memdisk
frontend UI
### Other resources and ideas
* use grml's
[patches to live-initramfs](http://git.grml.org/?p=live-initramfs-grml.git;a=tree;f=debian/patches)
to support directly booting an ISO image... merged in upstream Git,
commit 6458a8862db68. Another of their patches (namely
`07_support_findiso.dpatch`) adds support for the
`findiso` boot parameter, which is needed for easy usage; this one
has not been applied upstream yet; does it respect the
`live-media=removable` boot parameter?
* Philip Hands' solution proposed on [[!debbug 534887]]
uses extlinux chainloading the image's own bootloader
Frontend UI
-----------
[[!tag todo/test]]
(Testing all these is probably [[!taglink todo/easy]].)
Wikipedia has a [[!wikipedia List of tools to create Live USB systems]]
......@@ -287,7 +275,7 @@ we should look at.
- supports Windows and GNU/Linux
- no release in 2009 nor 2010
partitionning
Partitionning
-------------
* Benjamin FOURTICQ's
......
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