diff options
author | Alyssa Rosenzweig <alyssa@rosenzweig.io> | 2017-04-03 09:54:31 -0700 |
---|---|---|
committer | Alyssa Rosenzweig <alyssa@rosenzweig.io> | 2017-04-03 09:54:31 -0700 |
commit | a19ff95539b0f9df2a59abef64f0decf999103f2 (patch) | |
tree | 0e591af379687513a0850167b316618781349948 | |
parent | a23830654fa620d3982d851c9f8f0f99d282575d (diff) | |
download | librebootfr-a19ff95539b0f9df2a59abef64f0decf999103f2.tar.gz librebootfr-a19ff95539b0f9df2a59abef64f0decf999103f2.zip |
Fix another class of code block bugs
-rw-r--r-- | docs/future/index.md | 4 | ||||
-rw-r--r-- | docs/git/index.md | 56 | ||||
-rw-r--r-- | docs/gnulinux/configuring_parabola.md | 88 | ||||
-rw-r--r-- | docs/gnulinux/encrypted_parabola.md | 140 | ||||
-rw-r--r-- | docs/gnulinux/grub_cbfs.md | 4 | ||||
-rw-r--r-- | docs/hcl/gm45_remove_me.md | 8 | ||||
-rw-r--r-- | docs/hcl/t500.md | 2 | ||||
-rw-r--r-- | docs/install/bbb_setup.md | 10 | ||||
-rw-r--r-- | docs/install/c201.md | 12 | ||||
-rw-r--r-- | docs/install/index.md | 8 | ||||
-rw-r--r-- | docs/install/r400_external.md | 2 | ||||
-rw-r--r-- | docs/install/t400_external.md | 2 | ||||
-rw-r--r-- | docs/install/t500_external.md | 2 | ||||
-rw-r--r-- | docs/install/x200_external.md | 2 | ||||
-rw-r--r-- | docs/misc/index.md | 12 |
15 files changed, 176 insertions, 176 deletions
diff --git a/docs/future/index.md b/docs/future/index.md index f882967a..cc98bcb5 100644 --- a/docs/future/index.md +++ b/docs/future/index.md @@ -158,12 +158,12 @@ working and nonworking panels. How to dump EDID: -\# **apt-get install i2c-tools** + # apt-get install i2c-tools # modprobe i2c-dev Find out the correct ID to use: # i2cdetect -l\ Example:\ -\# **i2cdump -y 2 0x50** + # i2cdump -y 2 0x50 Working panel: EDID dump from LG-Philips LP150E05-A2K1: diff --git a/docs/git/index.md b/docs/git/index.md index ef7b3174..71faafc1 100644 --- a/docs/git/index.md +++ b/docs/git/index.md @@ -64,21 +64,21 @@ First, [install the build dependencies](#build_dependencies). Since libreboot makes extensive use of git, you need to configure git properly. If you have not yet configured git, then the minimum requirement is:\ -\$ **git config --global user.name "Your Name"**\ -\$ **git config --global user.email your@emailaddress.com**\ + $ git config --global user.name "Your Name" + $ git config --global user.email your@emailaddress.com This is what will also appear in git logs if you ever commit your own changes to a given repository. For more information, see <http://git-scm.com/doc>. Another nice config for you (optional, but recommended):\ -\$ **git config --global core.editor nano**\ -\$ **git config --global color.status auto**\ -\$ **git config --global color.branch auto**\ -\$ **git config --global color.interactive auto**\ -\$ **git config --global color.diff auto** + $ git config --global core.editor nano + $ git config --global color.status auto + $ git config --global color.branch auto + $ git config --global color.interactive auto + $ git config --global color.diff auto After that, run the script:\ -\$ **./download all** + $ ./download all What this did was download everything (grub, coreboot, memtest86+, bucts, flashrom) at the versions last tested for this release, and patch @@ -137,10 +137,10 @@ If you have the binary release archive, you'll find executables under First, [install the build dependencies](#build_dependencies). To build bucts, do this in the main directory:\ -\$ **./oldbuild module bucts** + $ ./oldbuild module bucts To statically compile it, do this:\ -\$ **./oldbuild module bucts static** + $ ./oldbuild module bucts static The "builddeps" script in libreboot\_src also makes use of builddeps-bucts. @@ -168,10 +168,10 @@ flashrom from source, continue reading. First, [install the build dependencies](#build_dependencies). To build it, do the following in the main directory:\ -\$ **./oldbuild module flashrom** + $ ./oldbuild module flashrom To statically compile it, do the following in the main directory:\ -\$ **./oldbuild module flashrom static** + $ ./oldbuild module flashrom static After you've done that, under ./flashrom/ you will find the following executables: @@ -215,24 +215,24 @@ If you downloaded libreboot from git, refer to [\#build\_meta](#build_meta). Build all of the components used in libreboot:\ -\$ **./oldbuild module all** + $ ./oldbuild module all You can also build each modules separately, using *./oldbuild module modulename*. To see the possible values for *modulename*, use:\ -\$ **./oldbuild module list** + $ ./oldbuild module list After that, build the ROM images (for all boards):\ -\$ **./oldbuild roms withgrub**\ + $ ./oldbuild roms withgrub Alternatively, you can build for a specific board or set of boards. For example:\ -\$ **./oldbuild roms withgrub x60**\ -\$ **./oldbuild roms withgrub x200\_8mb**\ -\$ **./oldbuild roms withgrub x60 x200\_8mb**\ + $ ./oldbuild roms withgrub x60 + $ ./oldbuild roms withgrub x200\_8mb + $ ./oldbuild roms withgrub x60 x200\_8mb The list of board options can be found by looking at the directory names in **resources/libreboot/config/grub/**. To clean (reverse) everything, do the following:\ -\$ **./oldbuild clean all** + $ ./oldbuild clean all The ROM images will be stored under **bin/*payload*/**, where *payload* could be *grub*, *seabios*, or whatever other payload those images were @@ -260,23 +260,23 @@ in the file names of the archives. Otherwise, whatever git uses for *git describe --tags HEAD* will be used. Utilities (static executables):\ -\$ **./oldbuild release util** + $ ./oldbuild release util Archive containing flashrom and bucts source code:\ -\$ **./oldbuild release tobuild** + $ ./oldbuild release tobuild Documentation archive (**does not work on \_src release archive, only git**):\ -\$ **./oldbuild release docs** + $ ./oldbuild release docs ROM image archives:\ -\$ **./oldbuild release roms** + $ ./oldbuild release roms Source code archive:\ -\$ **./oldbuild release src** + $ ./oldbuild release src SHA512 sums of all other release archives that have been generated:\ -\$ **./oldbuild release sha512sums** + $ ./oldbuild release sha512sums If you are building on an i686 host, this will build statically linked 32-bit binaries in the binary release archive that you created, for: @@ -305,8 +305,8 @@ libreboot\_util, for: If you are building binaries on a live system or chroot (for flashrom/bucts), you can use the following to statically link them:\ -\$ **./oldbuild module flashrom static**\ -\$ **./oldbuild module bucts static** + $ ./oldbuild module flashrom static + $ ./oldbuild module bucts static The same conditions as above apply for ARM (except, building bucts on ARM is pointless, and for flashrom you only need the normal executable @@ -316,7 +316,7 @@ restrictions). The command that you used for generating the release archives will also run the following command:\ -\$ **./oldbuild release tobuild**\ + $ ./oldbuild release tobuild The archive **tobuild.tar.xz** will have been created under **release/oldbuildsystem/**, containing bucts, flashrom and all other required resources for building them. diff --git a/docs/gnulinux/configuring_parabola.md b/docs/gnulinux/configuring_parabola.md index 12c05109..8a3f4751 100644 --- a/docs/gnulinux/configuring_parabola.md +++ b/docs/gnulinux/configuring_parabola.md @@ -127,12 +127,12 @@ Updating Parabola {#pacman_update} In the end, I didn't change my configuration for pacman. When you are updating, resync with the latest package names/versions:\ -\# **pacman -Syy**\ + # pacman -Syy (according to the wiki, -Syy is better than Sy because it refreshes the package list even if it appears to be up to date, which can be useful when switching to another mirror).\ Then, update the system:\ -\# **pacman -Syu** + # pacman -Syu **Before installing packages with 'pacman -S', always update first, using the notes above.** @@ -197,7 +197,7 @@ old package information, updated automatically when you do anything in pacman).** To clean out all old packages that are cached:\ -\# **pacman -Sc** + # pacman -Sc The wiki cautions that this should be used with care. For example, since older packages are deleted from the repo, if you encounter issues and @@ -206,7 +206,7 @@ caches available. Only do this if you are sure that you won't need it. The wiki also mentions this method for removing everything from the cache, including currently installed packages that are cached:\ -\# **pacman -Scc**\ + # pacman -Scc This is inadvisable, since it means re-downloading the package again if you wanted to quickly re-install it. This should only be used when disk space is at a premium. @@ -252,9 +252,9 @@ access to the entire operating system. Read the entire document linked to above, and then continue. Add your user:\ -\# **useradd -m -G wheel -s /bin/bash *yourusername***\ + # useradd -m -G wheel -s /bin/bash *yourusername* Set a password:\ -\# **passwd *yourusername*** + # passwd *yourusername* Use of the *diceware method* is recommended, for generating secure passphrases (instead of passwords). @@ -281,7 +281,7 @@ the background behind the decision by Arch (Parabola's upstream supplier) to use systemd. The manpage should also help:\ -\# **man systemd**\ + # man systemd The section on 'unit types' is especially useful. According to the wiki, systemd 'journal' keeps logs of a size up to @@ -301,7 +301,7 @@ The wiki also recommended a method for forwarding journal output to TTY to switch between terminals). I decided not to enable it. Restart journald:\ -\# **systemctl restart systemd-journald** + # systemctl restart systemd-journald The wiki recommends that if the journal gets too large, you can also simply delete (rm -Rf) everything inside /var/log/journald/\* but @@ -312,9 +312,9 @@ delete older records when the journal size reaches it's limit Finally, the wiki mentions 'temporary' files and the utility for managing them.\ -\# **man systemd-tmpfiles**\ + # man systemd-tmpfiles The command for 'clean' is:\ -\# **systemd-tmpfiles --clean**\ + # systemd-tmpfiles --clean According to the manpage, this *"cleans all files and directories with an age parameter"*. According to the Arch wiki, this reads information in /etc/tmpfiles.d/ and /usr/lib/tmpfiles.d/ to know what actions to @@ -324,7 +324,7 @@ locations to get a better understanding. I looked in /etc/tmpfiles.d/ and found that it was empty on my system. However, /usr/lib/tmpfiles.d/ contained some files. The first one was etc.conf, containing information and a reference to this manpage:\ -\# **man tmpfiles.d**\ + # man tmpfiles.d Read that manpage, and then continue studying all the files. The systemd developers tell me that it isn't usually necessary to touch @@ -349,10 +349,10 @@ and below the 'extra' section add:\ Include = /etc/pacman.d/mirrorlist* Now sync with the repository:\ -\# **pacman -Syy** + # pacman -Syy List all available packages in this repository:\ -\# **pacman -Sl kernels** + # pacman -Sl kernels In the end, I decided not to install anything from it but I kept the repository enabled regardless. @@ -373,12 +373,12 @@ Read <https://wiki.archlinux.org/index.php/Configuring_Network>. This should be the same as the hostname that you set in /etc/hostname when installing Parabola. You can also do it with systemd (do so now, if you like):\ -\# **hostnamectl set-hostname *yourhostname***\ + # hostnamectl set-hostname *yourhostname* This writes the specified hostname to /etc/hostname. More information can be found in these manpages:\ -\# **man hostname**\ -\# **info hostname**\ -\# **man hostnamectl** + # man hostname + # info hostname + # man hostnamectl Add the same hostname to /etc/hosts, on each line. Example:\ *127.0.0.1 localhost.localdomain localhost myhostname\ @@ -400,7 +400,7 @@ According to the Arch wiki, the ethernet chipset and load the driver for it automatically at boot time. You can check this in the *"Ethernet controller"* section when running this command:\ -\# **lspci -v** + # lspci -v Look at the remaining sections *'Kernel driver in use'* and *'Kernel modules'*. In my case it was as follows:\ @@ -409,7 +409,7 @@ Kernel modules: e1000e* Check that the driver was loaded by issuing *dmesg | grep module\_name*. In my case, I did:\ -\# **dmesg | grep e1000e** + # dmesg | grep e1000e ### Network device names {#network_devicenames} @@ -431,7 +431,7 @@ For background information, read [Predictable Network Interface Names](http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/) Show device names:\ -\# **ls /sys/class/net** + # ls /sys/class/net Changing the device names is possible (I chose not to do it):\ <https://wiki.archlinux.org/index.php/Configuring_Network#Change_device_name> @@ -463,7 +463,7 @@ is important, so make sure to read them!** Install smartmontools (it can be used to check smart data. HDDs use non-free firmware inside, but it's transparent to you but the smart data comes from it. Therefore, don't rely on it too much):\ -\# **pacman -S smartmontools**\ + # pacman -S smartmontools Read <https://wiki.archlinux.org/index.php/S.M.A.R.T.> to learn how to use it. @@ -488,27 +488,27 @@ provide LXDE by default. Based on <https://wiki.archlinux.org/index.php/Xorg>. Firstly, install it!\ -\# **pacman -S xorg-server**\ + # pacman -S xorg-server I also recommend installing this (contains lots of useful tools, including *xrandr*):\ -\# **pacman -S xorg-server-utils** + # pacman -S xorg-server-utils Install the driver. For me this was *xf86-video-intel* on the ThinkPad X60. T60 and macbook11/21 should be the same.\ -\# **pacman -S xf86-video-intel**\ + # pacman -S xf86-video-intel For other systems you can try:\ -\# **pacman -Ss xf86-video- | less**\ + # pacman -Ss xf86-video- | less Combined with looking at your *lspci* output, you can determine which driver is needed. By default, Xorg will revert to xf86-video-vesa which is a generic driver and doesn't provide true hardware acceleration. Other drivers (not just video) can be found by looking at the *xorg-drivers* group:\ -\# **pacman -Sg xorg-drivers**\ + # pacman -Sg xorg-drivers Mostly you will rely on a display manager, but in case you ever want to start X without one:\ -\# **pacman -S xorg-xinit** + # pacman -S xorg-xinit <optional>\ Arch wiki recommends installing these, for testing that X works:\ @@ -536,7 +536,7 @@ not actually be the same in X. To see what layout you currently use, try this on a terminal emulator in X:\ -\# **setxkbmap -print -verbose 10** + # setxkbmap -print -verbose 10 In my case, I wanted to use the Dvorak (UK) keyboard which is quite different from Xorg's default Qwerty (US) layout. @@ -583,27 +583,27 @@ would like to try something different, refer to Refer to <https://wiki.archlinux.org/index.php/LXDE>. Install it, choosing 'all' when asked for the default package list:\ -\# **pacman -S lxde obconf** + # pacman -S lxde obconf I didn't want the following, so I removed them:\ -\# **pacman -R lxmusic lxtask** + # pacman -R lxmusic lxtask I also lazily installed all fonts:\ -\# **pacman -S \$(pacman -Ssq ttf-)** + # pacman -S \$(pacman -Ssq ttf-) And a mail client:\ -\# **pacman -S icedove** + # pacman -S icedove In IceCat, go to *Preferences :: Advanced* and disable *GNU IceCat Health Report*. I also like to install these:\ -\# **pacman -S xsensors stress htop** + # pacman -S xsensors stress htop Enable LXDM (the default display manager, providing a graphical login):\ -\# **systemctl enable lxdm.service**\ + # systemctl enable lxdm.service It will start when you boot up the system. To start it now, do:\ -\# **systemctl start lxdm.service** + # systemctl start lxdm.service Log in with your standard (non-root) user that you created earlier. It is advisable to also create an xinitrc rule in case you ever want to @@ -648,7 +648,7 @@ NOTE TO SELF: come back to this later. ### LXDE - screenlock {#lxde_screenlock} Arch wiki recommends to use *xscreensaver*:\ -\# **pacman -S xscreensaver** + # pacman -S xscreensaver Under *Preferences :: Screensaver* in the LXDE menu, I chose *Mode: Blank Screen Only*, setting *Blank After*, *Cycle After* and *Lock @@ -699,30 +699,30 @@ Refer to <https://wiki.archlinux.org/index.php/LXDE#Network_Management>. Then I read: <https://wiki.archlinux.org/index.php/NetworkManager>. Install Network Manager:\ -\# **pacman -S networkmanager** + # pacman -S networkmanager You will also want the graphical applet:\ -\# **pacman -S network-manager-applet**\ + # pacman -S network-manager-applet Arch wiki says that an autostart rule will be written at */etc/xdg/autostart/nm-applet.desktop* I want to be able to use a VPN at some point, so the wiki tells me to do:\ -\# **pacman -S networkmanager-openvpn** + # pacman -S networkmanager-openvpn LXDE uses openbox, so I refer to:\ <https://wiki.archlinux.org/index.php/NetworkManager#Openbox>. It tells me for the applet I need:\ -\# **pacman -S xfce4-notifyd gnome-icon-theme**\ + # pacman -S xfce4-notifyd gnome-icon-theme Also, for storing authentication details (wifi) I need:\ -\# **pacman -S gnome-keyring** + # pacman -S gnome-keyring I wanted to quickly enable networkmanager:\ -\# **systemctl stop dhcpcd**\ -\# **systemctl start NetworkManager**\ + # systemctl stop dhcpcd + # systemctl start NetworkManager Enable NetworkManager at boot time:\ -\# **systemctl enable NetworkManager** + # systemctl enable NetworkManager Restart LXDE (log out, and then log back in). diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md index f17fa10e..2771bf34 100644 --- a/docs/gnulinux/encrypted_parabola.md +++ b/docs/gnulinux/encrypted_parabola.md @@ -83,7 +83,7 @@ header. showed me how to do this. It recommends doing the first 3MiB. Now, that guide is recommending putting zero there. I'm going to use urandom. Do this:\ -\# **head -c 3145728 /dev/urandom > /dev/sda; sync**\ + # head -c 3145728 /dev/urandom > /dev/sda; sync (Wiping the LUKS header is important, since it has hashed passphrases and so on. It's 'secure', but 'potentially' a risk). @@ -94,8 +94,8 @@ Change keyboard layout Parabola live shell assumes US Qwerty. If you have something different, list the available keymaps and use yours:\ -\# **localectl list-keymaps**\ -\# **loadkeys LAYOUT**\ + # localectl list-keymaps + # loadkeys LAYOUT For me, LAYOUT would have been dvorak-uk. @@ -123,7 +123,7 @@ dm-mod device-mapper will be used - a lot. Make sure that the kernel module is loaded:\ -\# **modprobe dm-mod** + # modprobe dm-mod Create LUKS partition --------------------- @@ -137,7 +137,7 @@ security purposes (mitigates brute force attacks), so anything lower than 5 seconds is probably not ok. I am using MBR partitioning, so I use cfdisk:\ -\# **cfdisk /dev/sda** + # cfdisk /dev/sda I create a single large sda1 filling the whole drive, leaving it as the default type 'Linux' (83). @@ -150,15 +150,15 @@ I am then directed to Parabola forces you to RTFM. Do that. It tells me to run:\ -\# **cryptsetup benchmark** (for making sure the list below is + # cryptsetup benchmark (for making sure the list below is populated)\ Then:\ -\# **cat /proc/crypto**\ + # cat /proc/crypto This gives me crypto options that I can use. It also provides a representation of the best way to set up LUKS (in this case, security is a priority; speed, a distant second). To gain a better understanding, I am also reading:\ -\# **man cryptsetup** + # man cryptsetup Following that page, based on my requirements, I do the following based on @@ -185,29 +185,29 @@ Create LVM Now I refer to <https://wiki.archlinux.org/index.php/LVM>. Open the LUKS partition:\ -\# **cryptsetup luksOpen /dev/sda1 lvm**\ + # cryptsetup luksOpen /dev/sda1 lvm (it will be available at /dev/mapper/lvm) Create LVM partition:\ -\# **pvcreate /dev/mapper/lvm**\ + # pvcreate /dev/mapper/lvm Show that you just created it:\ -\# **pvdisplay** + # pvdisplay Now I create the volume group, inside of which the logical volumes will be created:\ -\# **vgcreate matrix /dev/mapper/lvm**\ + # vgcreate matrix /dev/mapper/lvm (volume group name is 'matrix' - choose your own name, if you like) Show that you created it:\ -\# **vgdisplay** + # vgdisplay Now create the logical volumes:\ -\# **lvcreate -L 2G matrix -n swapvol** (2G swap partition, named + # lvcreate -L 2G matrix -n swapvol (2G swap partition, named swapvol)\ Again, choose your own name if you like. Also, make sure to choose a swap size of your own needs. It basically depends on how much RAM you have installed. I refer to <http://www.linux.com/news/software/applications/8208-all-about-linux-swap-space>.\ -\# **lvcreate -l +100%FREE matrix -n root** (single large partition in + # lvcreate -l +100%FREE matrix -n root (single large partition in the rest of the space, named root)\ You can also be flexible here, for example you can specify a /boot, a /, a /home, a /var, a /usr, etc. For example, if you will be running a @@ -217,7 +217,7 @@ system (typical use case), a root and a swap will do (really). Verify that the logical volumes were created, using the following command:\ -\# **lvdisplay** + # lvdisplay @@ -225,15 +225,15 @@ Create / and swap partitions, and mount --------------------------------------- For the swapvol LV I use:\ -\# **mkswap /dev/mapper/matrix-swapvol**\ + # mkswap /dev/mapper/matrix-swapvol Activate swap:\ -\# **swapon /dev/matrix/swapvol** + # swapon /dev/matrix/swapvol For the root LV I use:\ -\# **mkfs.btrfs /dev/mapper/matrix-root** + # mkfs.btrfs /dev/mapper/matrix-root Mount the root (/) partition:\ -\# **mount /dev/matrix/root /mnt** + # mount /dev/matrix/root /mnt @@ -248,8 +248,8 @@ Now I am following the rest of referenced <https://wiki.archlinux.org/index.php/Installation_guide>. Create /home and /boot on root mountpoint:\ -\# **mkdir -p /mnt/home**\ -\# **mkdir -p /mnt/boot** + # mkdir -p /mnt/home + # mkdir -p /mnt/boot Once all the remaining partitions, if any, have been mounted, the devices are ready to install Parabola. @@ -257,9 +257,9 @@ devices are ready to install Parabola. In **/etc/pacman.d/mirrorlist**, comment out all lines except the Server line closest to where you are (I chose the UK Parabola server (main server)) and then did:\ -\# **pacman -Syy**\ -\# **pacman -Syu**\ -\# **pacman -Sy pacman** (and then I did the other 2 steps above, + # pacman -Syy + # pacman -Syu + # pacman -Sy pacman (and then I did the other 2 steps above, again)\ In my case I did the steps in the next paragraph, and followed the steps in this paragraph again. @@ -311,21 +311,21 @@ Configure the system Generate an fstab - UUIDs are used because they have certain advantages (see <https://wiki.parabola.nu/Fstab#Identifying_filesystems>. If you prefer labels instead, replace the -U option with -L):\ -\# **genfstab -U -p /mnt >> /mnt/etc/fstab**\ + # genfstab -U -p /mnt >> /mnt/etc/fstab Check the created file:\ -\# **cat /mnt/etc/fstab**\ + # cat /mnt/etc/fstab (If there are any errors, edit the file. Do **NOT** run the genfstab command again!) Chroot into new system:\ -\# **arch-chroot /mnt /bin/bash** + # arch-chroot /mnt /bin/bash It's a good idea to have this installed:\ -\# **pacman -S linux-libre-lts** + # pacman -S linux-libre-lts It was also suggested that you should install this kernel (read up on what GRSEC is):\ -\# **pacman -S linux-libre-grsec** + # pacman -S linux-libre-grsec This is another kernel that sits inside /boot, which you can use. LTS means 'long-term support'. These are so-called 'stable' kernels that @@ -333,35 +333,35 @@ can be used as a fallback during updates, if a bad kernel causes issues for you. Parabola does not have wget. This is sinister. Install it:\ -\# **pacman -S wget** + # pacman -S wget Locale:\ -\# **vi /etc/locale.gen**\ + # vi /etc/locale.gen Uncomment your needed localisations. For example en\_GB.UTF-8 (UTF-8 is highly recommended over other options).\ -\# **locale-gen**\ -\# **echo LANG=en\_GB.UTF-8 > /etc/locale.conf**\ -\# **export LANG=en\_GB.UTF-8** + # locale-gen + # echo LANG=en\_GB.UTF-8 > /etc/locale.conf + # export LANG=en\_GB.UTF-8 Console font and keymap:\ -\# **vi /etc/vconsole.conf**\ + # vi /etc/vconsole.conf In my case: KEYMAP=dvorak-uk FONT=lat9w-16 Time zone:\ -\# **ln -s /usr/share/zoneinfo/Europe/London /etc/localtime**\ + # ln -s /usr/share/zoneinfo/Europe/London /etc/localtime (Replace Zone and Subzone to your liking. See /usr/share/zoneinfo) Hardware clock:\ -\# **hwclock --systohc --utc** + # hwclock --systohc --utc Hostname: Write your hostname to /etc/hostname. For example, if your hostname is parabola:\ -\# **echo parabola > /etc/hostname**\ + # echo parabola > /etc/hostname Add the same hostname to /etc/hosts:\ -\# **vi /etc/hosts**\ + # vi /etc/hosts #<ip-address> <hostname.domain.org> <hostname> 127.0.0.1 localhost.localdomain localhost parabola @@ -375,7 +375,7 @@ Mkinitcpio: Configure /etc/mkinitcpio.conf as needed (see /usr/lib/initcpio/hooks, and build hooks can be found in /usr/lib/initcpio/install. (\# **mkinitcpio -H hookname** gives information about each hook.) Specifically, for this use case:\ -\# **vi /etc/mkinitcpio.conf**\ + # vi /etc/mkinitcpio.conf Then modify the file like so: - MODULES="i915" @@ -400,18 +400,18 @@ Then modify the file like so: Now using mkinitcpio, you can create the kernel and ramdisk for booting with (this is different from Arch, specifying linux-libre instead of linux):\ -\# **mkinitcpio -p linux-libre**\ + # mkinitcpio -p linux-libre Also do it for linux-libre-lts:\ -\# **mkinitcpio -p linux-libre-lts**\ + # mkinitcpio -p linux-libre-lts Also do it for linux-libre-grsec:\ -\# **mkinitcpio -p linux-libre-grsec** + # mkinitcpio -p linux-libre-grsec Set the root password: At the time of writing, Parabola used SHA512 by default for its password hashing. I referred to <https://wiki.archlinux.org/index.php/SHA_password_hashes>.\ -\# **vi /etc/pam.d/passwd**\ + # vi /etc/pam.d/passwd Add rounds=65536 at the end of the uncommented 'password' line.\ -\# **passwd root**\ + # passwd root Make sure to set a secure password! Also, it must never be the same as your LUKS password. @@ -426,7 +426,7 @@ Extra security tweaks Based on <https://wiki.archlinux.org/index.php/Security>. Restrict access to important directories:\ -\# **chmod 700 /boot /etc/{iptables,arptables}** + # chmod 700 /boot /etc/{iptables,arptables} Lockout user after three failed login attempts:\ Edit the file /etc/pam.d/system-login and comment out that line:\ @@ -436,7 +436,7 @@ Or just delete it. Above it, put:\ file=/var/log/faillog*\ To unlock a user manually (if a password attempt is failed 3 times), do:\ -\# **pam\_tally --user *theusername* --reset** What the above + # pam\_tally --user *theusername* --reset What the above configuration does is lock the user out for 10 minutes, if they make 3 failed login attempts. @@ -450,20 +450,20 @@ Unmount, reboot! ---------------- Exit from chroot:\ -\# **exit** + # exit unmount:\ -\# **umount -R /mnt**\ -\# **swapoff -a** + # umount -R /mnt + # swapoff -a deactivate the lvm lv's:\ -\# **lvchange -an /dev/matrix/root**\ -\# **lvchange -an /dev/matrix/swapvol**\ + # lvchange -an /dev/matrix/root + # lvchange -an /dev/matrix/swapvol Lock the encrypted partition (close it):\ -\# **cryptsetup luksClose lvm** + # cryptsetup luksClose lvm -\# **shutdown -h now**\ + # shutdown -h now Remove the installation media, then boot up again. @@ -519,7 +519,7 @@ I will go for the re-flash option here. Firstly, cd to the libreboot\_util/cbfstool/{armv7l i686 x86\_64} directory. Dump the current firmware - where *libreboot.rom* is an example: make sure to adapt:\ -\# **flashrom -p internal -r libreboot.rom**\ + # flashrom -p internal -r libreboot.rom If flashrom complains about multiple flash chips detected, add a *-c* option at the end, with the name of your chosen chip is quotes.\ You can check if everything is in there (*grub.cfg* and *grubtest.cfg* @@ -528,7 +528,7 @@ would be really nice): Extract grubtest.cfg: $ ./cbfstool libreboot.rom extract -n grubtest.cfg -f grubtest.cfg\ And modify:\ -\$ **vi grubtest.cfg** + $ vi grubtest.cfg In grubtest.cfg, inside the 'Load Operating System' menu entry, change the contents to: @@ -557,18 +557,18 @@ hardening your GRUB configuration, for security purposes. Save your changes in grubtest.cfg, then delete the unmodified config from the ROM image:\ -\$ **./cbfstool libreboot.rom remove -n grubtest.cfg**\ + $ ./cbfstool libreboot.rom remove -n grubtest.cfg and insert the modified grubtest.cfg:\ \$ **./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t raw**\ Now refer to <http://libreboot.org/docs/install/#flashrom>. Cd (up) to the libreboot\_util directory and update the flash chip contents:\ -\# **./flash update libreboot.rom**\ + # ./flash update libreboot.rom Ocassionally, coreboot changes the name of a given board. If flashrom complains about a board mismatch, but you are sure that you chose the correct ROM image, then run this alternative command:\ -\# **./flash forceupdate libreboot.rom**\ + # ./flash forceupdate libreboot.rom You should see "Verifying flash\... VERIFIED." written at the end of the flashrom output. @@ -599,21 +599,21 @@ with the following command:\ 's:Switch to grub.cfg:Switch to grubtest.cfg:g' < grubtest.cfg > grub.cfg**\ Delete the grub.cfg that remained inside the ROM:\ -\$ **./cbfstool libreboot.rom remove -n grub.cfg**\ + $ ./cbfstool libreboot.rom remove -n grub.cfg Add the modified version that you just made:\ -\$ **./cbfstool libreboot.rom add -n grub.cfg -f grub.cfg -t raw**\ + $ ./cbfstool libreboot.rom add -n grub.cfg -f grub.cfg -t raw Now you have a modified ROM. Once more, refer to <http://libreboot.org/docs/install/#flashrom>. Cd to the libreboot\_util directory and update the flash chip contents:\ -\# **./flash update libreboot.rom**\ + # ./flash update libreboot.rom And wait for the "Verifying flash\... VERIFIED." Once you have done that, shut down and then boot up with your new configuration. When done, delete GRUB (remember, we only needed it for the *grub-mkpasswd-pbkdf2* utility; GRUB is already part of libreboot, flashed alongside it as a *payload*):\ -\# **pacman -R grub** + # pacman -R grub @@ -638,17 +638,17 @@ Boot up and login as root or your user. Then generate the key file:\ \# **dd bs=512 count=4 if=/dev/urandom of=/etc/mykeyfile iflag=fullblock**\ Insert it into the luks volume:\ -\# **cryptsetup luksAddKey /dev/sdX /etc/mykeyfile**\ + # cryptsetup luksAddKey /dev/sdX /etc/mykeyfile and enter your LUKS passphrase when prompted. Add the keyfile to the initramfs by adding it to FILES in /etc/mkinitcpio.conf. For example:\ -\# **FILES="/etc/mykeyfile"**\ + # FILES="/etc/mykeyfile" Create the initramfs image from scratch:\ -\# **mkinitcpio -p linux-libre**\ -\# **mkinitcpio -p linux-libre-lts**\ -\# **mkinitcpio -p linux-libre-grsec**\ + # mkinitcpio -p linux-libre + # mkinitcpio -p linux-libre-lts + # mkinitcpio -p linux-libre-grsec Add the following to your grub.cfg - you are now able to do that, see above! -, or add it in the kernel command line for GRUB:\ -\# **cryptkey=rootfs:/etc/mykeyfile**\ + # cryptkey=rootfs:/etc/mykeyfile \ You can also place this inside the grub.cfg that exists in CBFS: [grub\_cbfs.html](grub_cbfs.html). diff --git a/docs/gnulinux/grub_cbfs.md b/docs/gnulinux/grub_cbfs.md index 24fd2108..feb16b73 100644 --- a/docs/gnulinux/grub_cbfs.md +++ b/docs/gnulinux/grub_cbfs.md @@ -140,10 +140,10 @@ image file is named *libreboot.rom*, so please make sure to adapt. ROM images are included pre-compiled in libreboot. You can also dump your current firmware, using flashrom: $ sudo flashrom -p internal -r libreboot.rom -\# **flashrom -p internal -r libreboot.rom**\ + # flashrom -p internal -r libreboot.rom If you are told to specify the chip, add the option **-c {your chip}** to the command, for example:\ -\# **flashrom -c MX25L6405 -p internal -r libreboot.rom** + # flashrom -c MX25L6405 -p internal -r libreboot.rom [Back to top of page.](#pagetop) diff --git a/docs/hcl/gm45_remove_me.md b/docs/hcl/gm45_remove_me.md index 2001a9c6..c10c892e 100644 --- a/docs/hcl/gm45_remove_me.md +++ b/docs/hcl/gm45_remove_me.md @@ -69,7 +69,7 @@ On GM45 laptops that use flash descriptors, the MAC address or the onboard ethernet chipset is flashed (inside the ROM image). You should generate a descriptor+gbe image with your own MAC address inside (with the Gbe checksum updated to match). Run:\ -\$ **./ich9gen --macaddress XX:XX:XX:XX:XX:XX**\ + $ ./ich9gen --macaddress XX:XX:XX:XX:XX:XX (replace the XX chars with the hexadecimal chars in the MAC address that you want) @@ -164,7 +164,7 @@ If you are working with libreboot\_src (or git), you can find the source under resources/utilities/ich9deblob/ and will already be compiled if you ran **./oldbuild module all** or **./oldbuild module ich9deblob** from the main directory (./), otherwise you can build it like so:\ -\$ **./oldbuild module ich9deblob**\ + $ ./oldbuild module ich9deblob An executable file named **ich9deblob** will now appear under resources/utilities/ich9deblob/ @@ -176,7 +176,7 @@ Place the factory.rom from your system (can be obtained using the external flashing guides for GM45 targets linked [../install/](../install/)) in the directory where you have your ich9deblob executable, then run the tool:\ -\$ **./ich9deblob** + $ ./ich9deblob A 12kiB file named **deblobbed\_descriptor.bin** will now appear. **Keep this and the factory.rom stored in a safe location!** The first 4KiB @@ -232,7 +232,7 @@ descriptor locks some regions. The idea is that doing this will remove all of those restrictions. Simply run (with factory.rom in the same directory):\ -\$ **./demefactory** + $ ./demefactory It will generate a 4KiB descriptor file (only the descriptor, no GbE). Insert that into a factory.rom image (NOTE: do this on a copy of it. diff --git a/docs/hcl/t500.md b/docs/hcl/t500.md index 7a88b3ca..a17a6fc1 100644 --- a/docs/hcl/t500.md +++ b/docs/hcl/t500.md @@ -81,7 +81,7 @@ factory.rom image dumped from the T500 with a SOIC-8 4MiB flash chip. The patch re-creates the X200 descriptor/gbe source, so the commands were something like: $ diff -u t500gbe x200gbe -\$ **diff -u t500descriptor x200descriptor** + $ diff -u t500descriptor x200descriptor ME VSCC table is in a different place and a different size on the T500. Libreboot disables and removes the ME anyway, so it doesn't matter. diff --git a/docs/install/bbb_setup.md b/docs/install/bbb_setup.md index 6fb4e045..4211777e 100644 --- a/docs/install/bbb_setup.md +++ b/docs/install/bbb_setup.md @@ -209,14 +209,14 @@ contents of this file with: Run **apt-get update** and **apt-get upgrade** then reboot the BBB, before continuing. Check that the firmware exists:\ -\# **ls /lib/firmware/BB-SPI0-01-00A0.\***\ + # ls /lib/firmware/BB-SPI0-01-00A0.\* Output: /lib/firmware/BB-SPI0-01-00A0.dtbo Then:\ -\# **echo BB-SPI0-01 > /sys/devices/bone\_capemgr.\*/slots**\ -\# **cat /sys/devices/bone\_capemgr.\*/slots**\ + # echo BB-SPI0-01 > /sys/devices/bone\_capemgr.\*/slots + # cat /sys/devices/bone\_capemgr.\*/slots Output: 0: 54:PF--- @@ -228,7 +228,7 @@ Output: 7: ff:P-O-L Override Board Name,00A0,Override Manuf,BB-SPI0-01 Verify that the spidev device now exists:\ -\# **ls -al /dev/spid\***\ + # ls -al /dev/spid\* Output: crw-rw---T 1 root spi 153, 0 Nov 19 21:07 /dev/spidev1.0 @@ -251,7 +251,7 @@ Finally, get the ROM image that you would like to flash and put that on your BBB. Now test flashrom:\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512**\ + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 Output: Calibrating delay loop... OK. diff --git a/docs/install/c201.md b/docs/install/c201.md index 517f5311..23cbf1bc 100644 --- a/docs/install/c201.md +++ b/docs/install/c201.md @@ -154,12 +154,12 @@ The SPI flash has to be read first: this point and store it outside of the device for backup purposes.** Then, the **cros-flash-replace** script has to be executed as such:\ -\# **./cros-flash-replace flash.img coreboot ro-frid**\ + # ./cros-flash-replace flash.img coreboot ro-frid If any error is shown, it is definitely a bad idea to go further than this point. The resulting flash image can then be flashed back:\ -\# **flashrom -p host -w flash.img**\ + # flashrom -p host -w flash.img You should also see within the output the following:\ **"Verifying flash\... VERIFIED."** @@ -193,21 +193,21 @@ transferred to the host. The following operations have to be executed with root privileges on the host (e.g. using the *root* account). In addition, the **cros-flash-replace** script has to be made executable:\ -\# **chmod a+x cros-flash-replace**\ + # chmod a+x cros-flash-replace The SPI flash has to be read first (using the right spi programmer):\ -\# **flashrom -p *programmer* -r flash.img**\ + # flashrom -p *programmer* -r flash.img **Note: it might be a good idea to copy the produced flash.img file at this point and store it outside of the device for backup purposes.** Then, the **cros-flash-replace** script has to be executed as such:\ -\# **./cros-flash-replace flash.img coreboot ro-frid**\ + # ./cros-flash-replace flash.img coreboot ro-frid If any error is shown, it is definitely a bad idea to go further than this point. The resulting flash image can then be flashed back (using the right spi programmer):\ -\# **flashrom -p *programmer* -w flash.img**\ + # flashrom -p *programmer* -w flash.img You should also see within the output the following:\ **"Verifying flash\... VERIFIED."** diff --git a/docs/install/index.md b/docs/install/index.md index fd8ed008..c03237cf 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -279,7 +279,7 @@ How to update the flash chip contents: Ocassionally, coreboot changes the name of a given board. If flashrom complains about a board mismatch, but you are sure that you chose the correct ROM image, then run this alternative command:\ -\$ **sudo ./flash forceupdate [yourrom.rom](#rom)** + $ sudo ./flash forceupdate [yourrom.rom](#rom) @@ -319,7 +319,7 @@ https://notabug.org/vimuser/libreboot/raw/9d850543ad90b72e0e333c98075530b31e5d23 && chmod +x flash*** The first half of the procedure is as follows:\ -\$ **sudo ./flash i945lenovo\_firstflash [yourrom.rom](#rom).** + $ sudo ./flash i945lenovo\_firstflash [yourrom.rom](#rom). @@ -343,7 +343,7 @@ and then boot; libreboot is running, but there is a 2nd procedure When you have booted up again, you must also do this:\ -\$ **sudo ./flash i945lenovo\_secondflash [yourrom.rom](#rom)** + $ sudo ./flash i945lenovo\_secondflash [yourrom.rom](#rom) If flashing fails at this stage, try the following:\ \$ **sudo ./flashrom/i686/flashrom -p @@ -392,7 +392,7 @@ with your device. Use this flashing script, to install libreboot:\ -\$ **sudo ./flash i945apple\_firstflash [yourrom.rom](#rom)** + $ sudo ./flash i945apple\_firstflash [yourrom.rom](#rom) diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md index c568f18b..7f2e7c2c 100644 --- a/docs/install/r400_external.md +++ b/docs/install/r400_external.md @@ -253,7 +253,7 @@ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ Now compare the 3 images:\ -\# **sha512sum factory\*.rom**\ + # sha512sum factory\*.rom If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another system, not the BBB). This is useful for reverse engineering work, if there is a desirable diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md index 80868e00..2f8c424f 100644 --- a/docs/install/t400_external.md +++ b/docs/install/t400_external.md @@ -259,7 +259,7 @@ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ Now compare the 3 images:\ -\# **sha512sum factory\*.rom**\ + # sha512sum factory\*.rom If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another system, not the BBB). This is useful for reverse engineering work, if there is a desirable diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md index bccdc620..05e4c112 100644 --- a/docs/install/t500_external.md +++ b/docs/install/t500_external.md @@ -264,7 +264,7 @@ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ Now compare the 3 images:\ -\# **sha512sum factory\*.rom**\ + # sha512sum factory\*.rom If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another system, not the BBB). This is useful for reverse engineering work, if there is a desirable diff --git a/docs/install/x200_external.md b/docs/install/x200_external.md index 2aa70cc5..ac199b2a 100644 --- a/docs/install/x200_external.md +++ b/docs/install/x200_external.md @@ -193,7 +193,7 @@ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ Now compare the 3 images:\ -\# **sha512sum factory\*.rom**\ + # sha512sum factory\*.rom If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another system, not the BBB). This is useful for reverse engineering work, if there is a desirable diff --git a/docs/misc/index.md b/docs/misc/index.md index 59679ab0..15d0ea08 100644 --- a/docs/misc/index.md +++ b/docs/misc/index.md @@ -28,7 +28,7 @@ Included with libreboot is a script called 'powertop.debian'. Run this as root and it will setup powertop to run with --auto-tune at boot time. Load the file in your text editor to see how it does that. -\$ **sudo ./resources/scripts/misc/powertop.debian** + $ sudo ./resources/scripts/misc/powertop.debian Might want to run with --calibrate first @@ -229,11 +229,11 @@ behaviour. Disable or enable beeps when removing/adding the charger: $ sudo ./nvramtool -w power\_management\_beeps=Enable -\$ **sudo ./nvramtool -w power\_management\_beeps=Disable** + $ sudo ./nvramtool -w power\_management\_beeps=Disable Disable or enable beeps when battery is low: $ sudo ./nvramtool -w low\_battery\_beep=Enable\ -\$ **sudo ./nvramtool -w low\_battery\_beep=Disable** + $ sudo ./nvramtool -w low\_battery\_beep=Disable A reboot is required, for these changes to take effect. @@ -247,10 +247,10 @@ Or look in **/sys/class/drm/card0-LVDS-1/edid** Alternatively you can use i2cdump. In Debian and Devuan, this is in the package i2c-tools.\ -\$ **sudo modprobe i2c-dev**\ -\$ **sudo i2cdump -y 5 0x50** (you might have to change the value for + $ sudo modprobe i2c-dev + $ sudo i2cdump -y 5 0x50 (you might have to change the value for -y)\ -\$ **sudo rmmod i2c-dev**\ + $ sudo rmmod i2c-dev You'll see the panel name in the output (from the EDID dump). If neither of these options work (or they are unavailable), physically |