From ec6f90a90fed3e3bdf841d56a3f9ded7ae7b3f66 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 12 Oct 2016 15:23:14 +0100 Subject: Delete all references to Trisquel in the documentation --- docs/gnulinux/encrypted_debian.html | 41 +++++++++++++++++++--------------- docs/gnulinux/grub_boot_installer.html | 14 +++++++----- docs/gnulinux/index.html | 2 +- 3 files changed, 32 insertions(+), 25 deletions(-) (limited to 'docs/gnulinux') diff --git a/docs/gnulinux/encrypted_debian.html b/docs/gnulinux/encrypted_debian.html index 64f4668d..a9ce08b8 100644 --- a/docs/gnulinux/encrypted_debian.html +++ b/docs/gnulinux/encrypted_debian.html @@ -8,12 +8,12 @@ @import url('../css/main.css'); - Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot) + Installing Debian GNU/Linux with full disk encryption (including /boot)
-

Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot)

+

Installing Debian GNU/Linux with full disk encryption (including /boot)

The libreboot project recommends Debian, because it is more stable and up to date, while still being entirely free software by default. Leah Rowe, libreboot's @@ -37,10 +37,25 @@ access to the system.

- This guide is written for Debian. - This also works in Trisquel 7 (probably Trisquel 8), and probably Trisquel 6. Boot the 'net installer' (Install Trisquel in Text Mode). - How to boot a GNU/Linux installer. + This guide is written for Debian net installer. You can download the ISO from the homepage on + debian.org. + Use this on the GRUB terminal to boot it from USB (for 64-bit Intel or AMD):
+ + set root='usb0'
+ linux /install.amd/vmlinuz
+ initrd /install.amd/initrd.gz
+ boot
+ If you are on a 32-bit system (e.g. X60): + set root='usb0'
+ linux /install.386/vmlinuz
+ initrd /install.386/initrd.gz
+ boot +

+

+ This guide shows how to + create a boot USB drive with the Debian ISO image. +

This guide is *only* for the GRUB payload. If you use the depthcharge payload, ignore this section entirely.

@@ -188,22 +203,12 @@
-

Tasksel (Debian or Trisquel)

+

Tasksel

-

- Choose "Trisquel Desktop Environment" if you want GNOME, - "Trisquel-mini Desktop Environment" if you - want LXDE or "Triskel Desktop Environment" if you want KDE. - If you want to have no desktop (just a basic shell) - when you boot or if you want to create your own custom setup, then choose nothing here (don't select anything). - You might also want to choose some of the other package groups; it's up to you. -

For Debian, use the MATE option, or one of the others if you want. -

-

- On Debian or Trisquel, you may also want to select the option for a printer server, - so that you can print. + The libreboot project recommends MATE, unless you're saavy enough to choose something + else.

If you want debian-testing, then you should only select barebones options here diff --git a/docs/gnulinux/grub_boot_installer.html b/docs/gnulinux/grub_boot_installer.html index acede631..38aca2fa 100644 --- a/docs/gnulinux/grub_boot_installer.html +++ b/docs/gnulinux/grub_boot_installer.html @@ -23,7 +23,7 @@

  • Prepare the USB drive (in GNU/Linux)
  • Installing GNU/Linux with full disk encryption
  • GNU Guix System Distribution?
    • -
  • Debian or Trisquel net install?
    • +
  • Debian net install?
  • Booting ISOLINUX images (automatic method)
  • Booting ISOLINUX images (manual method)
  • Troubleshooting
    • @@ -80,7 +80,7 @@

    Installing GNU/Linux with full disk encryption

    @@ -92,7 +92,7 @@
    -

    Debian or Trisquel net install?

    +

    Debian net install?

    Tip: don't use the official net install image. Download the full GNOME ISO (the ~1.5GiB one). @@ -153,10 +153,12 @@

    - For Trisquel (and other debian-based distros), there are typically menuentries listed in + For Debian (and other debian-based distros), there are typically menuentries listed in /isolinux/txt.cfg or /isolinux/gtk.cfg. For dual-architecture ISO images (i686 and x86_64), there may be separate files/directories for each architecture. Just keep searching through the image, until you find the correct ISOLINUX configuration file. + NOTE: Debian 8.6 ISO only lists 32-bit boot options in txt.cfg. This is important if you want + 64-bit booting on your system.

    @@ -207,13 +209,13 @@

    debian-installer graphical corruption in text-mode

    When using the ROM images that use coreboot's "text mode" instead of the coreboot framebuffer, - booting the Trisquel net installer results in graphical corruption because it is trying to switch to a framebuffer which doesn't + booting the Debian net installer results in graphical corruption because it is trying to switch to a framebuffer which doesn't exist. Use that kernel parameter on the 'linux' line when booting it:
    vga=normal fb=false

    - Tested in Trisquel 6 (and 7). This forces debian-installer to start in text-mode, instead of trying to switch to a framebuffer. + This forces debian-installer to start in text-mode, instead of trying to switch to a framebuffer.

    diff --git a/docs/gnulinux/index.html b/docs/gnulinux/index.html index eb1493d7..830b7816 100644 --- a/docs/gnulinux/index.html +++ b/docs/gnulinux/index.html @@ -35,7 +35,7 @@

  • Follow-up tutorial: Configuring Parabola (post-install)
    • -
  • Installing Debian or Trisquel GNU/Linux-libre with full disk encryption (including /boot)
    • +
  • Installing Debian GNU/Linux-libre with full disk encryption (including /boot)
    • -- cgit v1.2.3-70-g09d2