Commit a1d07f3c authored by sajolida's avatar sajolida
Browse files

Merge branch 'web/10311-debian-usb' (#10311)

I'm not closing the ticket because it needs more work after Tails
Installer is in Debian and Ubuntu.
parents 894fc396 dcc0dce0
......@@ -11,8 +11,8 @@
[[!inline pages="install/inc/steps/verify_up-to-date.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap" rel="stylesheet"]]
[[!meta title="Installing Tails on a USB stick from Debian or Ubuntu"]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian-usb" rel="stylesheet" title=""]]
[[Back|install/debian]]
Debian to USB
[[!inline pages="install/inc/steps/install_tails_installer.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -96,7 +96,7 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
5. Click **Save**.
<div class="step-image">[[!img inc/infography/restart-on-final-tails-with-persistence.png link="no"]]</div>
<div class="step-image">[[!img inc/infography/restart-on-tails.png link="no"]]</div>
1. Shut down the computer and restart on <span class="windows-usb linux-usb mac-usb">the final</span><span class="clone">the new</span> Tails<span class="dvd"> USB stick</span>.
......
......@@ -12,11 +12,12 @@ using *Tails Installer*.
</div>
<div class="step-image">
[[!img inc/infography/plug-second-usb.png link="no" class="usb clone"]]
[[!img inc/infography/plug-usb.png link="no" class="debian-usb"]]
[[!img inc/infography/plug-second-usb.png link="no" class="windows-usb linux-usb mac-usb clone"]]
[[!img inc/infography/plug-tails-usb.png link="no" class="dvd"]]
</div>
1. Plug the <span class="usb">second</span><span class="clone">new</span> USB stick in the computer.
1. Plug the <span class="windows-usb linux-usb mac-usb">second</span><span class="clone">new</span> USB stick in the computer.
1. <div class="windows linux mac"><p>
Choose
......@@ -41,12 +42,13 @@ using *Tails Installer*.
[[!img inc/screenshots/tails_installer_in_debian.png link=no class="debian expert"]]
<div class="step-image">
[[!img inc/infography/clone-temporary-tails.png link="no" class="usb clone"]]
[[!img inc/infography/install-tails.png link="no" class="debian-usb"]]
[[!img inc/infography/clone-temporary-tails.png link="no" class="windows-usb linux-usb mac-usb clone"]]
[[!img inc/infography/clone-dvd.png link="no" class="dvd"]]
</div>
1. Use the <span class="guilabel">Target Device</span> drop-down list to
specify the <span class="usb">second</span><span class="clone">new</span> USB stick.
specify the <span class="windows-usb linux-usb mac-usb">second</span><span class="clone">new</span> USB stick.
1. To start the installation, click on the <span
class="button">Install Tails</span> button.
......
......@@ -3,7 +3,8 @@ Restart on <span class="windows-usb linux-usb win-usb">the temporary</span><span
<div class="step-image">
[[!img inc/infography/plug-source-usb.png link="no" class="clone"]]
[[!img inc/infography/restart-on-temporary-tails.png link="no" class="clone usb"]]
[[!img inc/infography/restart-on-tails.png link="no" class="debian-usb"]]
[[!img inc/infography/restart-on-temporary-tails.png link="no" class="clone windows-usb linux-usb mac-usb"]]
[[!img inc/infography/restart-on-dvd.png link="no" class="dvd"]]
</div>
......@@ -43,9 +44,10 @@ in a similar way.</p>
[[!img doc/first_steps/start_tails/tails_boot_menu.png link=no alt="Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'."]]
<div class="note windows debian linux">
<div class="note debian expert windows linux">
<p>Most computers do not start on Tails by default. If it does you
are lucky. Otherwise, if the computer starts on
<span class="debian expert">Debian or Ubuntu,</span>
<span class="windows">Windows,</span>
<span class="linux">Linux,</span> refer to the
troubleshooting section about [[!toggle id="not_at_all" text="Tails
......
......@@ -13,6 +13,7 @@ the rest of the instructions afterwards, we recommend you either:
[[!img inc/qrcodes/tails_boum_org_install_mac_usb.png class="mac-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_mac_clone.png class="mac-clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_mac_dvd.png class="mac-dvd" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_debian_usb.png class="debian-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_debian_clone.png class="debian-clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_expert_usb.png class="expert-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux-usb" link="no"]]
......@@ -27,6 +28,7 @@ the rest of the instructions afterwards, we recommend you either:
<a class="mac-usb" href="https://tails.boum.org/install/mac/usb/">https://tails.boum.org/install/mac/usb/</a>
<a class="mac-clone" href="https://tails.boum.org/install/mac/clone/">https://tails.boum.org/install/mac/clone/</a>
<a class="mac-dvd" href="https://tails.boum.org/install/mac/dvd/">https://tails.boum.org/install/mac/dvd/</a>
<a class="debian-usb" href="https://tails.boum.org/install/debian/usb/">https://tails.boum.org/install/debian/usb/</a>
<a class="debian-clone" href="https://tails.boum.org/install/debian/clone/">https://tails.boum.org/install/debian/clone/</a>
<a class="expert-usb" href="https://tails.boum.org/install/expert/usb/">https://tails.boum.org/install/expert/usb/</a>
<a class="linux-usb" href="https://tails.boum.org/install/linux/usb/">https://tails.boum.org/install/linux/usb/</a>
......
@import url("debian.css");
@import url("usb.css");
span.debian-usb, a.debian-usb {
display: inline;
}
div.debian-usb, img.debian-usb, p.debian-usb {
display: block;
}
li.debian-usb {
display: list-item;
}
......@@ -13,6 +13,6 @@
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -45,6 +45,6 @@
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -13,6 +13,6 @@
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -54,6 +54,6 @@ image on a DVD.
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -111,6 +111,6 @@ downloaded earlier to the USB stick. Replace:
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -13,6 +13,6 @@
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -54,6 +54,6 @@ Installer*.
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
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