From c6134a9a28ec99d8ed0ea9cd20b8b1510d2e4647 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Sun, 2 Jul 2017 22:36:43 -0400 Subject: OpenBSD docs: Fix grammar --- docs/bsd/openbsd.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md index ce8a3f06..1ef4e774 100644 --- a/docs/bsd/openbsd.md +++ b/docs/bsd/openbsd.md @@ -31,7 +31,7 @@ Connect the USB drive. Check dmesg: $ dmesg | tail -Check to confirm which drive it is, for example, if you think its sd3: +Check to confirm which drive it is, for example, if you think it's sd3: $ disklabel sd3 @@ -110,7 +110,7 @@ Installing OpenBSD with full disk encryption Not working. You can modify the above procedure (installation w/o encryption) to install OpenBSD using full disk encryption, and it -appears to work, except that its not yet clear how to actually *boot* an +appears to work, except that it's not yet clear how to actually *boot* an OpenBSD+FDE installation using libreboot+Grub2. If you get it working, please let us know. -- cgit v1.2.3-70-g09d2 From 730db68244eb4fe0e8df32326df1946405426ed1 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Sun, 2 Jul 2017 22:59:41 -0400 Subject: OpenBSD docs: mark up "dd" as a command Other command lines are marked up similarly in openbsd.md, so "dd" should be as well. --- docs/bsd/openbsd.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md index 1ef4e774..1e475124 100644 --- a/docs/bsd/openbsd.md +++ b/docs/bsd/openbsd.md @@ -12,7 +12,7 @@ LibertyBSD and prioritise that in this guide. This section relates to preparing, booting and installing OpenBSD on your libreboot system, using nothing more than a USB flash drive (and -*dd*). They've only been tested on a Lenovo ThinkPad x200. +`dd`). They've only been tested on a Lenovo ThinkPad x200. *This section is only for the GRUB payload. For depthcharge (used on CrOS devices in libreboot), instructions have yet to be written in the @@ -54,7 +54,7 @@ Prepare the USB drive (in NetBSD) [This page](https://wiki.netbsd.org/tutorials/how_to_install_netbsd_from_an_usb_memory_stick/) on the NetBSD website shows how to create a NetBSD bootable USB drive -from within NetBSD itself. You should use the *dd* method documented +from within NetBSD itself. You should use the `dd` method documented there. This will also work with the OpenBSD image. Prepare the USB drive (in FreeBSD) @@ -62,7 +62,7 @@ Prepare the USB drive (in FreeBSD) [This page](https://www.freebsd.org/doc/handbook/bsdinstall-pre.md) on the FreeBSD website shows how to create a bootable USB drive for -installing FreeBSD. Use the *dd* on that page. You can also use the same +installing FreeBSD. Use the `dd` on that page. You can also use the same instructions with a OpenBSD ISO image. Prepare the USB drive (in GNU+Linux) -- cgit v1.2.3-70-g09d2 From 2d4f8d80a020b28057c87edb72b72b058983d8f1 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Sun, 2 Jul 2017 23:01:42 -0400 Subject: OpenBSD docs: update references from 6.0 to 6.1 Because why not? --- docs/bsd/openbsd.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md index 1e475124..5e86bc05 100644 --- a/docs/bsd/openbsd.md +++ b/docs/bsd/openbsd.md @@ -18,7 +18,7 @@ your libreboot system, using nothing more than a USB flash drive (and CrOS devices in libreboot), instructions have yet to be written in the libreboot documentation.* -install60.fs is the installation image for OpenBSD 6.0. Adapt the +install61.fs is the installation image for OpenBSD 6.1. Adapt the filename accordingly, for a different OpenBSD version or LibertyBSD. Prepare the USB drive (in LibertyBSD or OpenBSD) @@ -88,8 +88,8 @@ example: dmesg told you what device it is. Overwrite the drive, writing your distro ISO to it with dd. For example: - $ sudo dd if=install60.fs of=/dev/sdX bs=8M; sync - # dd if=install60.fs of=/dev/sdX bs=8M; sync + $ sudo dd if=install61.fs of=/dev/sdX bs=8M; sync + # dd if=install61.fs of=/dev/sdX bs=8M; sync You should now be able to boot the installer from your USB drive. Continue reading, for information about how to do that. @@ -99,7 +99,7 @@ Installing OpenBSD without full disk encryption Press C in GRUB to access the command line: - grub> kopenbsd (usb0,openbsd1)/6.0/amd64/bsd.rd + grub> kopenbsd (usb0,openbsd1)/6.1/amd64/bsd.rd grub> boot It will start booting into the OpenBSD installer. Follow the normal -- cgit v1.2.3-70-g09d2 From 4a103c50128ad1f97dc7d2fe7ec70f880e42fcb4 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Sun, 2 Jul 2017 23:02:18 -0400 Subject: OpenBSD docs: cleanup "prepare USB drive" section Avoid jargon, add markup where applicable, rewrite for brevity, etc. --- docs/bsd/openbsd.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md index 5e86bc05..584fefd7 100644 --- a/docs/bsd/openbsd.md +++ b/docs/bsd/openbsd.md @@ -27,21 +27,19 @@ Prepare the USB drive (in LibertyBSD or OpenBSD) If you downloaded your ISO on a LibertyBSD or OpenBSD system, here is how to create the bootable LibertyBSD/OpenBSD USB drive: -Connect the USB drive. Check dmesg: +Connect the USB drive and check the system message buffer: $ dmesg | tail -Check to confirm which drive it is, for example, if you think it's sd3: +Check to confirm which drive it is, for example, if you think it's `sd3`: $ disklabel sd3 -Check that it wasn't automatically mounted. If it was, unmount it. For -example: +Check that it wasn't automatically mounted. If it was, unmount it: $ doas umount /dev/sd3i -dmesg told you what device it is. Overwrite the drive, writing the -OpenBSD installer to it with dd. For example: +Now write the OpenBSD installer to the drive with `dd`: $ doas dd if=install60.fs of=/dev/rsdXc bs=1M; sync -- cgit v1.2.3-70-g09d2 From 6591f07837a8fffaad49ea3458cf14fc708163ac Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Sun, 2 Jul 2017 23:03:17 -0400 Subject: OpenBSD docs: Add grub.conf caveat for GPT users The openbsd1 partition is only present for users with an MBR installation of OpenBSD, which not everyone has. --- docs/bsd/openbsd.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md index 584fefd7..7fb96d9f 100644 --- a/docs/bsd/openbsd.md +++ b/docs/bsd/openbsd.md @@ -159,6 +159,9 @@ On your OpenBSD root partition, create the `/grub` directory and add the file kopenbsd -r sd0a (ahci0,openbsd1)/bsd } +If your OpenBSD installation uses a GPT scheme, use the `gpt4` partition +instead of `openbsd1`. + The next time you boot, you'll see the old Grub menu for a few seconds, then you'll see the a new menu with only OpenBSD on the list. After 3 seconds OpenBSD will boot, or you can hit enter to boot. -- cgit v1.2.3-70-g09d2