Commit 4cb04c88 authored by Tails developers's avatar Tails developers
Browse files

Build and install documentation into the chroot.

Rationale: our static website cannot be copied to a FAT32 filesystem
due to filenames being too long. Changing this would be a pain.
Hence building and installing it into the chroot (-> filesystem.squashfs)
rather than into the binary_local-includes (-> iso9660 / FAT32 filesystem).

This means the documentation cannot be browsed offline from outside Tails.
However, our installer creates GPT hidden partitions, so the doc would not be
browseable from outside Tails anyway. The only usecase we really break by doing
so is browsing the documentation while running a non-Tails system, from a Tails
CD.
parent a38be1e9
......@@ -17,7 +17,6 @@
/config/chroot
/config/common
/config/source
/config/binary_local-includes/doc/amnesia/wiki
/config/chroot_local-includes/etc/amnesia/environment
/config/chroot_local-includes/etc/amnesia/version
/config/chroot_local-includes/usr/share/amnesia/readahead-list
......@@ -25,6 +24,7 @@
/config/chroot_local-includes/usr/share/doc/Changelog
/config/chroot_local-includes/usr/share/doc/amnesia/Changelog
/config/chroot_local-includes/usr/share/doc/amnesia/amnesia.asc
/config/chroot_local-includes/usr/share/doc/tails/website
/.lock
/.stage
/source
......@@ -42,6 +42,7 @@ chmod -R go+rx config/chroot_local-includes/lib/live/config
chmod -R go+rX config/chroot_local-includes/usr
chmod -R go+rx config/chroot_local-includes/usr/local/bin
chmod -R go+rx config/chroot_local-includes/usr/local/sbin
chmod -R go+rX config/chroot_local-includes/usr/share/doc/tails
chmod -R go+rX config/chroot_apt
chmod -R go+rX config/chroot_sources
......
......@@ -34,5 +34,5 @@ rm -f config/chroot_local-includes/home/amnesia/.gnome2/nautilus-scripts/*
rm -f config/chroot_local-includes/usr/share/amnesia/build/variables
# static wiki
rm -rf config/binary_local-includes/doc wiki/src/.ikiwiki
rm -rf config/chroot_local-includes/usr/share/doc/tails/website wiki/src/.ikiwiki
find wiki/src -name *.pot -exec rm {} \;
......@@ -6,7 +6,7 @@ else
PAGE='index'
fi
WIKI_ROOT='/live/image/doc/amnesia/wiki'
WIKI_ROOT='/usr/share/doc/tails/website'
LANG_CODE="`echo ${LANG} | head -c 2`"
if [ -r "${WIKI_ROOT}/${PAGE}.${LANG_CODE}.html" ]; then
......
......@@ -54,7 +54,7 @@ my $summary = gettext("Warning: virtual machine detected!");
my $body =
gettext("Both the host operating system and the virtualization software are able to monitor what you are doing in Tails.")
. " "
. gettext("<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en.html'>Learn more...</a>")
. gettext("<a href='file:///usr/share/doc/tails/website/support/virtualization.en.html'>Learn more...</a>")
. " "; # Workaround: else the last line of the notification is not displayed
$notify->create(summary => $summary,
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-03 12:38+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-03 12:38+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-03 12:38+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-03 12:38+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-03 12:38+0200\n"
"PO-Revision-Date: 2010-10-03 12:39+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: 2011-07-09 15:40+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -30,17 +30,15 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.fr."
"html'>En savoir plus...</a>"
msgstr "<a href='file:///usr/share/doc/tails/website/support/virtualization.fr.html'>En savoir plus...</a>"
#~ msgid ""
#~ "If you are not aware to be using a virtual machine: there could be a <a "
#~ "href='https://amnesia.boum.org/found_a_problem/'>bug</a> in the "
#~ "virtualization detection software Tails uses... or something really "
#~ "weird is happening."
#~ "virtualization detection software Tails uses... or something really weird "
#~ "is happening."
#~ msgstr ""
#~ "Si vous ne pensez pas utiliser une machine virtuelle : il peut y avoir un "
#~ "<a href='https://amnesia.boum.org/found_a_problem/'>bug</a> dans le "
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-03 12:38+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-03 12:38+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-03 12:38+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-18 18:14+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-18 18:14+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-18 18:14+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-18 18:14+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-18 18:14+0200\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///live/image/doc/amnesia/wiki/support/virtualization.en."
"<a href='file:///usr/share/doc/tails/website/support/virtualization.en."
"html'>Learn more...</a>"
msgstr ""
......@@ -19,9 +19,9 @@ banned_users: []
# where the source of the wiki is located
srcdir: wiki/src
# where to build the wiki
destdir: config/binary_local-includes/doc/amnesia/wiki
destdir: config/chroot_local-includes/usr/share/doc/tails/website
# base url to the wiki
url: file:///live/image/doc/amnesia/wiki
url: file:///usr/share/doc/tails/website
# url to the ikiwiki.cgi
cgiurl: ''
# filename of cgi wrapper to generate
......
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