Commit ab6eab37 authored by sajolida's avatar sajolida
Browse files

Create /upgrade/linux

parent 87d32988
...@@ -186,6 +186,7 @@ See our instructions on how to do a manual upgrade by: ...@@ -186,6 +186,7 @@ See our instructions on how to do a manual upgrade by:
- [[Downloading and upgrading from your Tails|upgrade/tails-overview]] (more secure) - [[Downloading and upgrading from your Tails|upgrade/tails-overview]] (more secure)
- [[Downloading and upgrading from Windows|upgrade/win-overview]] (more convenient) - [[Downloading and upgrading from Windows|upgrade/win-overview]] (more convenient)
- [[Downloading and upgrading from macOS|upgrade/mac-overview]] (more convenient) - [[Downloading and upgrading from macOS|upgrade/mac-overview]] (more convenient)
- [[Downloading and upgrading from Linux|upgrade/linux-overview]] (more convenient)
<div class="caution"> <div class="caution">
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<div id="steps"> <div id="steps">
<h3>Your steps</h3> <h3>Your steps</h3>
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-2 windows linux mac expert upgrade-windows"> <div class="col-xs-12 col-sm-2 windows linux mac expert upgrade-os">
<div class="thumbnail"> <div class="thumbnail">
[[!img install/inc/infography/download-and-verify.png link="no" alt="USB image downloaded and verified"]] [[!img install/inc/infography/download-and-verify.png link="no" alt="USB image downloaded and verified"]]
<p>Download</p> <p>Download</p>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<p>Install intermediary</p> <p>Install intermediary</p>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-2 upgrade-windows"> <div class="col-xs-12 col-sm-2 upgrade-os">
<div class="thumbnail"> <div class="thumbnail">
[[!img install/inc/infography/install-upgrade-usb-only.png link="no" alt="USB image installed on USB stick on the left"]] [[!img install/inc/infography/install-upgrade-usb-only.png link="no" alt="USB image installed on USB stick on the left"]]
<p>Install intermediary</p> <p>Install intermediary</p>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
[[!img install/inc/screenshots/tails_installer_upgrade.png link="no" class="upgrade" alt="Tails Installer: 'Clone the current Tails'"]] [[!img install/inc/screenshots/tails_installer_upgrade.png link="no" class="upgrade" alt="Tails Installer: 'Clone the current Tails'"]]
<div class="step-image"> <div class="step-image">
[[!img install/inc/infography/clone-tails.png link="no" class="clone upgrade-tails upgrade-windows" alt="Tails installed on USB stick on the right"]] [[!img install/inc/infography/clone-tails.png link="no" class="clone upgrade-tails upgrade-os" alt="Tails installed on USB stick on the right"]]
</div> </div>
1. Choose 1. Choose
......
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
<span class="upgrade-tails">[[Skip download|upgrade/tails]]</span> <span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
<span class="upgrade-windows">[[Skip download|upgrade/win]]</span> <span class="upgrade-windows">[[Skip download|upgrade/win]]</span>
<span class="upgrade-mac">[[Skip download|upgrade/mac]]</span> <span class="upgrade-mac">[[Skip download|upgrade/mac]]</span>
<span class="upgrade-linux">[[Skip download|upgrade/linux]]</span>
</div> </div>
<div id="skip-verification-direct" class="block"> <div id="skip-verification-direct" class="block">
<div class="windows">[[Skip verification!|win/usb]]</div> <div class="windows">[[Skip verification!|win/usb]]</div>
...@@ -143,6 +144,7 @@ ...@@ -143,6 +144,7 @@
<div class="upgrade-tails">[[Skip verification!|upgrade/tails]]</div> <div class="upgrade-tails">[[Skip verification!|upgrade/tails]]</div>
<div class="upgrade-windows">[[Skip verification!|upgrade/win]]</div> <div class="upgrade-windows">[[Skip verification!|upgrade/win]]</div>
<div class="upgrade-mac">[[Skip verification!|upgrade/mac]]</div> <div class="upgrade-mac">[[Skip verification!|upgrade/mac]]</div>
<div class="upgrade-linux">[[Skip verification!|upgrade/linux]]</div>
</div> </div>
<div id="next-direct"> <div id="next-direct">
<div class="windows">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|win/usb]]</div> <div class="windows">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
...@@ -151,6 +153,7 @@ ...@@ -151,6 +153,7 @@
<div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div> <div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<div class="upgrade-windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/win]]</div> <div class="upgrade-windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/win]]</div>
<div class="upgrade-mac">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/mac]]</div> <div class="upgrade-mac">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/mac]]</div>
<div class="upgrade-linux">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/linux]]</div>
<div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div> <div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
<div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div> <div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
<div class="download-only-img"> <div class="download-only-img">
...@@ -159,6 +162,7 @@ ...@@ -159,6 +162,7 @@
<li>[[Upgrade from your Tails|upgrade/tails]]</li> <li>[[Upgrade from your Tails|upgrade/tails]]</li>
<li>[[Upgrade from Windows|upgrade/win]]</li> <li>[[Upgrade from Windows|upgrade/win]]</li>
<li>[[Upgrade from macOS|upgrade/mac]]</li> <li>[[Upgrade from macOS|upgrade/mac]]</li>
<li>[[Upgrade from Linux|upgrade/linux]]</li>
</ul> </ul>
<p>Install a new USB stick:</p> <p>Install a new USB stick:</p>
<ul> <ul>
...@@ -215,6 +219,7 @@ ...@@ -215,6 +219,7 @@
<p class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails-download/</code></p> <p class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails-download/</code></p>
<p class="upgrade-windows"><code>https://tails.boum.org/upgrade/win-download/</code></p> <p class="upgrade-windows"><code>https://tails.boum.org/upgrade/win-download/</code></p>
<p class="upgrade-mac"><code>https://tails.boum.org/upgrade/mac-download/</code></p> <p class="upgrade-mac"><code>https://tails.boum.org/upgrade/mac-download/</code></p>
<p class="upgrade-linux"><code>https://tails.boum.org/upgrade/linux-download/</code></p>
<p class="dvd"><code>https://tails.boum.org/install/dvd-download/</code></p> <p class="dvd"><code>https://tails.boum.org/install/dvd-download/</code></p>
<p class="vm"><code>https://tails.boum.org/install/vm-download/</code></p> <p class="vm"><code>https://tails.boum.org/install/vm-download/</code></p>
<p class="download-only-img"><code>https://tails.boum.org/install/download/</code></p> <p class="download-only-img"><code>https://tails.boum.org/install/download/</code></p>
...@@ -277,6 +282,7 @@ ...@@ -277,6 +282,7 @@
<span class="upgrade-tails">[[Skip download|upgrade/tails]]</span> <span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
<span class="upgrade-windows">[[Skip download|upgrade/win]]</span> <span class="upgrade-windows">[[Skip download|upgrade/win]]</span>
<span class="upgrade-mac">[[Skip download|upgrade/mac]]</span> <span class="upgrade-mac">[[Skip download|upgrade/mac]]</span>
<span class="upgrade-linux">[[Skip download|upgrade/linux]]</span>
</div> </div>
<div id="next-bittorrent"> <div id="next-bittorrent">
<div class="windows">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|win/usb]]</div> <div class="windows">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
...@@ -285,6 +291,7 @@ ...@@ -285,6 +291,7 @@
<div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div> <div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<div class="upgrade-windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/win]]</div> <div class="upgrade-windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/win]]</div>
<div class="upgrade-mac">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/mac]]</div> <div class="upgrade-mac">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/mac]]</div>
<div class="upgrade-linux">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/linux]]</div>
<div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div> <div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
<div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div> <div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
<div class="download-only-img"> <div class="download-only-img">
...@@ -293,6 +300,7 @@ ...@@ -293,6 +300,7 @@
<li>[[Upgrade from your Tails|upgrade/tails]]</li> <li>[[Upgrade from your Tails|upgrade/tails]]</li>
<li>[[Upgrade from Windows|upgrade/win]]</li> <li>[[Upgrade from Windows|upgrade/win]]</li>
<li>[[Upgrade from macOS|upgrade/mac]]</li> <li>[[Upgrade from macOS|upgrade/mac]]</li>
<li>[[Upgrade from Linux|upgrade/linux]]</li>
</ul> </ul>
<p>Install a new USB stick:</p> <p>Install a new USB stick:</p>
<ul> <ul>
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
<div class="step-image"> <div class="step-image">
[[!img install/inc/infography/plug-usb.png link="no" class="linux" alt="USB stick plugged in the computer"]] [[!img install/inc/infography/plug-usb.png link="no" class="linux" alt="USB stick plugged in the computer"]]
[[!img install/inc/infography/plug-upgrade-usb.png link="no" class="upgrade" alt="USB stick plugged on the left"]] [[!img install/inc/infography/plug-upgrade-usb.png link="no" class="upgrade-tails" alt="USB stick plugged on the left"]]
[[!img install/inc/infography/plug-upgrade-usb-only.png link="no" class="upgrade-linux" alt="USB stick plugged on the left"]]
</div> </div>
1. Plug in the <span class="upgrade">intermediary</span> USB stick <span class="linux">on which you want to install Tails</span>. 1. Plug in the <span class="upgrade">intermediary</span> USB stick <span class="linux">on which you want to install Tails</span>.
...@@ -30,7 +31,8 @@ ...@@ -30,7 +31,8 @@
<div class="step-image"> <div class="step-image">
[[!img install/inc/infography/install-tails.png link="no" class="linux" alt="USB image installed on USB stick"]] [[!img install/inc/infography/install-tails.png link="no" class="linux" alt="USB image installed on USB stick"]]
[[!img install/inc/infography/install-upgrade-usb.png link="no" class="upgrade" alt="USB image installed on USB stick on the left"]] [[!img install/inc/infography/install-upgrade-usb.png link="no" class="upgrade-tails" alt="USB image installed on USB stick on the left"]]
[[!img install/inc/infography/install-upgrade-usb-only.png link="no" class="upgrade-linux" alt="USB image installed on USB stick on the left"]]
</div> </div>
1. Click on the 1. Click on the
...@@ -66,7 +68,9 @@ ...@@ -66,7 +68,9 @@
<p>If the image has an <span class="filename">.iso</span> file <p>If the image has an <span class="filename">.iso</span> file
extension, it is not the correct image. Please go back to the extension, it is not the correct image. Please go back to the
<span class="linux">[[download step for installing from Linux|linux/usb-download]]</span><span class="upgrade-tails">[[download step for upgrading from Tails|upgrade/tails-download]]</span>.</p> <span class="linux">[[download step for installing from Linux|linux/usb-download]].</span>
<span class="upgrade-tails">[[download step for upgrading from Tails|upgrade/tails-download]].</span>
<span class="upgrade-linux">[[download step for upgrading from Linux|upgrade/linux-download]].</span></p>
</div> </div>
1. Click on the <span class="button">Start Restoring&hellip;</span> button. 1. Click on the <span class="button">Start Restoring&hellip;</span> button.
......
...@@ -28,6 +28,7 @@ the rest of the instructions afterwards, we recommend you either: ...@@ -28,6 +28,7 @@ the rest of the instructions afterwards, we recommend you either:
[[!img install/inc/qrcodes/tails_boum_org_upgrade_tails_back_1.png class="upgrade-tails qrcode" link="no" alt=""]] [[!img install/inc/qrcodes/tails_boum_org_upgrade_tails_back_1.png class="upgrade-tails qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_win_back_1.png class="upgrade-windows qrcode" link="no" alt=""]] [[!img install/inc/qrcodes/tails_boum_org_upgrade_win_back_1.png class="upgrade-windows qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_mac_back_1.png class="upgrade-mac qrcode" link="no" alt=""]] [[!img install/inc/qrcodes/tails_boum_org_upgrade_mac_back_1.png class="upgrade-mac qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_linux_back_1.png class="upgrade-linux qrcode" link="no" alt=""]]
- Open this page on your smartphone, tablet, or another computer (recommended). - Open this page on your smartphone, tablet, or another computer (recommended).
...@@ -45,6 +46,7 @@ the rest of the instructions afterwards, we recommend you either: ...@@ -45,6 +46,7 @@ the rest of the instructions afterwards, we recommend you either:
<span class="upgrade-tails">`https://tails.boum.org/upgrade/tails?back=1`</span> <span class="upgrade-tails">`https://tails.boum.org/upgrade/tails?back=1`</span>
<span class="upgrade-windows">`https://tails.boum.org/upgrade/win?back=1`</span> <span class="upgrade-windows">`https://tails.boum.org/upgrade/win?back=1`</span>
<span class="upgrade-mac">`https://tails.boum.org/upgrade/mac?back=1`</span> <span class="upgrade-mac">`https://tails.boum.org/upgrade/mac?back=1`</span>
<span class="upgrade-linux">`https://tails.boum.org/upgrade/linux?back=1`</span>
<h1 id="start-intermediary" class="upgrade-tails upgrade-os">Restart on the intermediary Tails</h1> <h1 id="start-intermediary" class="upgrade-tails upgrade-os">Restart on the intermediary Tails</h1>
<h1 id="start-other" class="clone">Restart on the other Tails</h1> <h1 id="start-other" class="clone">Restart on the other Tails</h1>
...@@ -53,11 +55,11 @@ the rest of the instructions afterwards, we recommend you either: ...@@ -53,11 +55,11 @@ the rest of the instructions afterwards, we recommend you either:
<div class="step-image"> <div class="step-image">
[[!img install/inc/infography/plug-other-tails.png link="no" class="clone" alt="USB stick plugged on the left"]] [[!img install/inc/infography/plug-other-tails.png link="no" class="clone" alt="USB stick plugged on the left"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="windows linux mac" alt="Computer restarted on USB stick"]] [[!img install/inc/infography/restart-on-tails.png link="no" class="windows linux mac" alt="Computer restarted on USB stick"]]
[[!img install/inc/infography/restart-on-other-tails.png link="no" class="clone upgrade-windows" alt="Computer restarted on USB stick on the left"]] [[!img install/inc/infography/restart-on-other-tails.png link="no" class="clone upgrade-os" alt="Computer restarted on USB stick on the left"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails" alt="USB stick unplugged on the right and computer restarted on USB stick on the left"]] [[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails" alt="USB stick unplugged on the right and computer restarted on USB stick on the left"]]
</div> </div>
<div class="windows linux expert install-clone upgrade-clone upgrade-tails upgrade-windows"> <div class="windows linux expert install-clone upgrade-clone upgrade-tails upgrade-windows upgrade-linux">
[[!inline pages="install/inc/steps/pc_boot_menu.inline" raw="yes" sort="age"]] [[!inline pages="install/inc/steps/pc_boot_menu.inline" raw="yes" sort="age"]]
</div> </div>
......
...@@ -104,7 +104,7 @@ td, th { ...@@ -104,7 +104,7 @@ td, th {
.install-clone, .mac-clone, .install-clone, .mac-clone,
.windows, .linux, .mac, .expert, .windows, .linux, .mac, .expert,
.upgrade, .upgrade-clone, .upgrade-tails, .upgrade, .upgrade-clone, .upgrade-tails,
.upgrade-os, .upgrade-windows, .upgrade-mac { .upgrade-os, .upgrade-windows, .upgrade-mac, .upgrade-linux {
display: none; display: none;
} }
......
@import url("upgrade-os.css");
span.upgrade-linux, a.upgrade-linux {
display: inline;
}
div.upgrade-linux, img.upgrade-linux, p.upgrade-linux, h1.upgrade-linux {
display: block;
}
li.upgrade-linux {
display: list-item;
}
h1:before, span.next-counter:before {
content: counter(step)'/5';
}
[[!meta title="Manually upgrade from Linux"]]
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/download" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-linux" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/download"]]
[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
<div>[[!meta title="Manually upgrade from Linux"]]</div>
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-linux" rel="stylesheet" title=""]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-body">Let's go!</div>
</div>
|upgrade/linux-download]]
<div class="clearfix"></div>
[[!meta title="Manually upgrade from Linux"]]
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-linux" rel="stylesheet" title=""]]
<div class="hidden-step-1"></div>
<div class="step-image">[[!img install/inc/infography/os-linux.png link="no" alt=""]]</div>
<p class="start">Start in Tails.</p>
Install an intermediary Tails
=============================
In this step, you will install an intermediary Tails using the Tails USB
image that you downloaded earlier.
<div class="note">
<p>The persistent storage of your Tails USB stick will not be
copied to the temporary Tails.</p>
</div>
[[!inline pages="install/inc/steps/install_with_gnome_disks.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/clone.inline" raw="yes" sort="age"]]
[[!meta title="Manually upgrade from your Tails (or Linux)"]] [[!meta title="Manually upgrade from your Tails"]]
[[!meta robots="noindex"]] [[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]] [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
......
<div>[[!meta title="Manually upgrade from your Tails (or Linux)"]]</div> <div>[[!meta title="Manually upgrade from your Tails"]]</div>
[[!meta robots="noindex"]] [[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]] [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
......
[[!meta title="Manually upgrade from your Tails (or Linux)"]] [[!meta title="Manually upgrade from your Tails"]]
[[!meta robots="noindex"]] [[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]] [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="step-image">[[!img install/inc/infography/os-tails.png link="no" alt=""]]</div> <div class="step-image">[[!img install/inc/infography/os-tails.png link="no" alt=""]]</div>
<p class="start">Start in Tails or Linux.</p> <p class="start">Start in Tails.</p>
Install an intermediary Tails Install an intermediary Tails
============================= =============================
......
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