From a68fcbe31a9b7c75503e8e18ee59b5ed4ab8ac4c Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 08:34:36 -0700 Subject: Remove \ and squeaze --- docs/depthcharge/index.md | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs/depthcharge') diff --git a/docs/depthcharge/index.md b/docs/depthcharge/index.md index 1c361a7d..e75d3fa6 100644 --- a/docs/depthcharge/index.md +++ b/docs/depthcharge/index.md @@ -195,8 +195,6 @@ The following parameters can be configured: Copyright © 2015 Paul Kocialkowski \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation -- cgit v1.2.3-70-g09d2 From 980cea4eaa0333a78095f84f90602737a3ef05e2 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 08:53:46 -0700 Subject: Fix another shell style bug --- docs/depthcharge/index.md | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'docs/depthcharge') diff --git a/docs/depthcharge/index.md b/docs/depthcharge/index.md index e75d3fa6..4a1b7a87 100644 --- a/docs/depthcharge/index.md +++ b/docs/depthcharge/index.md @@ -164,34 +164,43 @@ The following parameters can be configured: - Kernels signature verification: - Enabled with: - \# **crossystem dev\_boot\_signed\_only=1** + # crossystem dev\_boot\_signed\_only=1 + - Disabled with: - \# **crossystem dev\_boot\_signed\_only=0** + # crossystem dev\_boot\_signed\_only=0 + - External media boot: - Enabled with: - \# **crossystem dev\_boot\_usb=1** + # crossystem dev\_boot\_usb=1 + - Disabled with: - \# **crossystem dev\_boot\_usb=0** + # crossystem dev\_boot\_usb=0 + - Legacy payload boot: - Enabled with: - \# **crossystem dev\_boot\_legacy=1** + # crossystem dev\_boot\_legacy=1 + - Disabled with: - \# **crossystem dev\_boot\_legacy=0** + # crossystem dev\_boot\_legacy=0 + - Default boot medium: - Internal storage: - \# **crossystem dev\_default\_boot=disk** + # crossystem dev\_default\_boot=disk + - External media: - \# **crossystem dev\_default\_boot=usb** + # crossystem dev\_default\_boot=usb + - Legacy payload: - \# **crossystem dev\_default\_boot=legacy** + # crossystem dev\_default\_boot=legacy + Copyright © 2015 Paul Kocialkowski \ -- cgit v1.2.3-70-g09d2 From 2845c86cb32828d39c63a45ed0b920d6bd90ac60 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 09:09:58 -0700 Subject: Cleanup depthcharge --- docs/depthcharge/index.md | 103 +++++++++++++++------------------------------- 1 file changed, 33 insertions(+), 70 deletions(-) (limited to 'docs/depthcharge') diff --git a/docs/depthcharge/index.md b/docs/depthcharge/index.md index 4a1b7a87..ebfbbefe 100644 --- a/docs/depthcharge/index.md +++ b/docs/depthcharge/index.md @@ -1,24 +1,11 @@ --- title: Depthcharge payload +x-toc-enable: true ... This section relates to the depthcharge payload used in libreboot. -- [CrOS security model](#cros_security_model) -- [Developer mode screen](#developer_mode_screen) - - Holding the developer mode screen - - Booting normally - - Booting from different mediums - - Showing device information - - Warnings - -- [Recovery mode screen](#recovery_mode_screen) - - [Recovering from a bad state](#recovering_bad_state) - - [Enabling developer mode](#enabling_developer_mode) -- [Configuring verified boot - parameters](#configuring_verified_boot_parameters) - -CrOS security model {#cros_security_model} +CrOS security model =================== CrOS (Chromium OS/Chrome OS) devices such as Chromebooks implement a @@ -32,27 +19,24 @@ kernels without verifying their signature and booting from external media or legacy payload unless explicitly allowed: see [configuring verified boot parameters](#configuring_verified_boot_parameters). -Developer mode screen {#developer_mode_screen} +Developer mode screen ===================== -The developer mode screen can be accessed in depthcharge when developer -mode is enabled.\ -Developer mode can be enabled from the [recovery mode -screen](#recovery_mode_screen). +The developer mode screen can be accessed in depthcharge when developer mode is +enabled. Developer mode can be enabled from the recovery mode screen. It allows booting normally, booting from internal storage, booting from -external media (when enabled), booting from legacy payload (when -enabled), showing information about the device and disabling developer -mode. +external media (when enabled), booting from legacy payload (when enabled), +showing information about the device and disabling developer mode. -Holding the developer mode screen {#holding_developer_mode_screen} +Holding the developer mode screen --------------------------------- As instructed on the developer mode screen, the screen can be held by pressing **Ctrl + H** in the first 3 seconds after the screen is shown. After that delay, depthcharge will resume booting normally. -Booting normally {#booting_normally} +Booting normally ---------------- As instructed on the developer mode screen, a regular boot will happen @@ -60,7 +44,7 @@ after **3 seconds** (if developer mode screen is not held).\ The default boot medium (internal storage, external media, legacy payload) is shown on screen. -Booting from different mediums {#booting_different_mediums} +Booting from different mediums ------------------------------ Depthcharge allows booting from different mediums, when they are allowed @@ -74,13 +58,12 @@ can be triggered by pressing various key combinations: - External media: **Ctrl + U** (when enabled) - Legacy payload: **Ctrl + L** (when enabled) -Showing device information {#showing_device_information} +Showing device information -------------------------- -As instructed on the developer mode screen, showing device information -can be triggered by pressing **Ctrl + I** or **Tab**.\ -Various information is shown, including vboot non-volatile data, TPM -status, GBB flags and key hashes.\ +As instructed on the developer mode screen, showing device information can be +triggered by pressing **Ctrl + I** or **Tab**. Various information is shown, +including vboot non-volatile data, TPM status, GBB flags and key hashes. Warnings -------- @@ -91,7 +74,7 @@ The developer mode screen will show warnings when: - Booting from external media is enabled - Booting legacy payloads is enabled -Recovery mode screen {#recovery_mode_screen} +Recovery mode screen ==================== The recovery mode screen can be accessed in depthcharge, by pressing @@ -101,7 +84,7 @@ It allows recovering the device from a bad state by booting from a trusted recovery media. When accessed with the device in a good state, it also allows enabling developer mode. -Recovering from a bad state {#recovering_bad_state} +Recovering from a bad state --------------------------- When the device fails to verify the signature of a piece of the boot @@ -127,15 +110,14 @@ replaced. When the recovery private key is available (e.g. when using self-generated keys), it can be used to sign a kernel for recovery purposes. -Enabling developer mode {#enabling_developer_mode} +Enabling developer mode ----------------------- As instructed on the recovery mode screen, developer mode can be enabled -by pressing **Ctrl + D**.\ -Instructions to confirm enabling developer mode are then shown on -screen. +by pressing **Ctrl + D**. Instructions to confirm enabling developer mode are +then shown on screen. -Configuring verified boot parameters {#configuring_verified_boot_parameters} +Configuring verified boot parameters ==================================== Depthcharge's behavior relies on the verified boot (vboot) reference @@ -161,45 +143,26 @@ security of the device. The following parameters can be configured: -- Kernels signature verification: - - Enabled with: +Kernels signature verification: - # crossystem dev\_boot\_signed\_only=1 + # crossystem dev\_boot\_signed\_only=1 # enable + # crossystem dev\_boot\_signed\_only=0 # disable - - Disabled with: +External media boot: - # crossystem dev\_boot\_signed\_only=0 + # crossystem dev\_boot\_usb=1 # enable + # crossystem dev\_boot\_usb=0 # disable -- External media boot: - - Enabled with: +Legacy payload boot: - # crossystem dev\_boot\_usb=1 + # crossystem dev\_boot\_legacy=1 # enable + # crossystem dev\_boot\_legacy=0 # disable - - Disabled with: +Default boot medium: - # crossystem dev\_boot\_usb=0 - -- Legacy payload boot: - - Enabled with: - - # crossystem dev\_boot\_legacy=1 - - - Disabled with: - - # crossystem dev\_boot\_legacy=0 - -- Default boot medium: - - Internal storage: - - # crossystem dev\_default\_boot=disk - - - External media: - - # crossystem dev\_default\_boot=usb - - - Legacy payload: - - # crossystem dev\_default\_boot=legacy + # crossystem dev\_default\_boot=disk # internal storage + # crossystem dev\_default\_boot=usb # external media + # crossystem dev\_default\_boot=legacy # legacy payload Copyright © 2015 Paul Kocialkowski \ -- cgit v1.2.3-70-g09d2 From 5e2ee3b2a94f1ac3e6a716af8d60513ab064a678 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 09:12:13 -0700 Subject: Fix underscores in code --- docs/depthcharge/index.md | 18 +++++++++--------- docs/gnulinux/encrypted_parabola.md | 8 ++++---- docs/hardware/gm45_remove_me.md | 10 +++++----- docs/install/bbb_setup.md | 6 +++--- docs/install/r400_external.md | 10 +++++----- docs/install/t400_external.md | 10 +++++----- docs/install/t500_external.md | 10 +++++----- docs/install/t60_unbrick.md | 2 +- docs/install/x60_unbrick.md | 2 +- docs/install/x60tablet_unbrick.md | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) (limited to 'docs/depthcharge') diff --git a/docs/depthcharge/index.md b/docs/depthcharge/index.md index ebfbbefe..1c0c8d13 100644 --- a/docs/depthcharge/index.md +++ b/docs/depthcharge/index.md @@ -145,24 +145,24 @@ The following parameters can be configured: Kernels signature verification: - # crossystem dev\_boot\_signed\_only=1 # enable - # crossystem dev\_boot\_signed\_only=0 # disable + # crossystem dev_boot_signed_only=1 # enable + # crossystem dev_boot_signed_only=0 # disable External media boot: - # crossystem dev\_boot\_usb=1 # enable - # crossystem dev\_boot\_usb=0 # disable + # crossystem dev_boot_usb=1 # enable + # crossystem dev_boot_usb=0 # disable Legacy payload boot: - # crossystem dev\_boot\_legacy=1 # enable - # crossystem dev\_boot\_legacy=0 # disable + # crossystem dev_boot_legacy=1 # enable + # crossystem dev_boot_legacy=0 # disable Default boot medium: - # crossystem dev\_default\_boot=disk # internal storage - # crossystem dev\_default\_boot=usb # external media - # crossystem dev\_default\_boot=legacy # legacy payload + # crossystem dev_default_boot=disk # internal storage + # crossystem dev_default_boot=usb # external media + # crossystem dev_default_boot=legacy # legacy payload Copyright © 2015 Paul Kocialkowski \ diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md index 62884ecd..deb0ba4e 100644 --- a/docs/gnulinux/encrypted_parabola.md +++ b/docs/gnulinux/encrypted_parabola.md @@ -336,7 +336,7 @@ I also like to install other packages (base-devel, compilers and so on) and wpa\_supplicant/dialog/iw/wpa\_actiond are needed for wireless after the install: - # pacstrap /mnt base base-devel wpa\_supplicant dialog iw + # pacstrap /mnt base base-devel wpa_supplicant dialog iw wpa\_actiond @@ -386,8 +386,8 @@ 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 + # echo LANG=en_GB.UTF-8 > /etc/locale.conf + # export LANG=en_GB.UTF-8 Console font and keymap: @@ -501,7 +501,7 @@ 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. diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md index 253b4b6e..5d9bc312 100644 --- a/docs/hardware/gm45_remove_me.md +++ b/docs/hardware/gm45_remove_me.md @@ -90,19 +90,19 @@ file to where **libreboot.rom** is located and then insert the descriptor+gbe file into the ROM image.\ For 16MiB flash chips: - # dd if=ich9fdgbe\_16m.bin of=libreboot.rom bs=1 count=12k + # dd if=ich9fdgbe_16m.bin of=libreboot.rom bs=1 count=12k conv=notrunc For 8MiB flash chips: - # dd if=ich9fdgbe\_8m.bin of=libreboot.rom bs=1 count=12k + # dd if=ich9fdgbe_8m.bin of=libreboot.rom bs=1 count=12k conv=notrunc For 4MiB flash chips: - # dd if=ich9fdgbe\_4m.bin of=libreboot.rom bs=1 count=12k + # dd if=ich9fdgbe_4m.bin of=libreboot.rom bs=1 count=12k conv=notrunc @@ -206,7 +206,7 @@ Assuming that your libreboot image is named **libreboot.rom**, copy the **deblobbed\_descriptor.bin** file to where **libreboot.rom** is located and then run: - # dd if=deblobbed\_descriptor.bin of=libreboot.rom bs=1 count=12k + # dd if=deblobbed_descriptor.bin of=libreboot.rom bs=1 count=12k conv=notrunc @@ -251,7 +251,7 @@ 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. Keep the original factory.rom stored safely somewhere): - # dd if=demefactory\_4kdescriptor.bin of=factory\_nome.rom bs=1 + # dd if=demefactory_4kdescriptor.bin of=factory_nome.rom bs=1 count=4k conv=notrunc diff --git a/docs/install/bbb_setup.md b/docs/install/bbb_setup.md index 77f805fc..b80203b4 100644 --- a/docs/install/bbb_setup.md +++ b/docs/install/bbb_setup.md @@ -211,8 +211,8 @@ Output: 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: @@ -251,7 +251,7 @@ 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: diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md index 6c044f58..80e1a676 100644 --- a/docs/install/r400_external.md +++ b/docs/install/r400_external.md @@ -216,7 +216,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512\ + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512\ In this case, the output was: @@ -232,15 +232,15 @@ In this case, the output was: How to backup factory.rom (change the -c option as neeed, for your flash chip): - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom @@ -266,7 +266,7 @@ address to one that is correct for your system.** Now flash it: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md index 414c1a5f..bbb7240f 100644 --- a/docs/install/t400_external.md +++ b/docs/install/t400_external.md @@ -214,7 +214,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 In this case, the output was: @@ -230,15 +230,15 @@ In this case, the output was: How to backup factory.rom (change the -c option as neeed, for your flash chip): - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom @@ -264,7 +264,7 @@ address to one that is correct for your system.** Now flash it: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md index 259d996e..749ef455 100644 --- a/docs/install/t500_external.md +++ b/docs/install/t500_external.md @@ -231,7 +231,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 In this case, the output was: @@ -247,15 +247,15 @@ In this case, the output was: How to backup factory.rom (change the -c option as neeed, for your flash chip): - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom @@ -281,7 +281,7 @@ address to one that is correct for your system.** Now flash it: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V diff --git a/docs/install/t60_unbrick.md b/docs/install/t60_unbrick.md index e3469074..bc8d83e3 100644 --- a/docs/install/t60_unbrick.md +++ b/docs/install/t60_unbrick.md @@ -143,7 +143,7 @@ source code which can be built. SSH'd into the BBB: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom diff --git a/docs/install/x60_unbrick.md b/docs/install/x60_unbrick.md index 233209c9..9c558631 100644 --- a/docs/install/x60_unbrick.md +++ b/docs/install/x60_unbrick.md @@ -128,7 +128,7 @@ source code which can be built. SSH'd into the BBB: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom diff --git a/docs/install/x60tablet_unbrick.md b/docs/install/x60tablet_unbrick.md index 0386cc1b..3a04ad3f 100644 --- a/docs/install/x60tablet_unbrick.md +++ b/docs/install/x60tablet_unbrick.md @@ -107,7 +107,7 @@ source code which can be built. SSH'd into the BBB: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom -- cgit v1.2.3-70-g09d2