summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2020-07-10 17:04:49 +0000
committerderaadt <deraadt@openbsd.org>2020-07-10 17:04:49 +0000
commit56b879ee2c52abf05d341489c8929c4f4527e5d9 (patch)
treec8cad19b6a95d6a7e26feeaf72a8adde0c244436
parentadjust %n description to vaguely say "pointer", becuase the following (diff)
downloadwireguard-openbsd-56b879ee2c52abf05d341489c8929c4f4527e5d9.tar.xz
wireguard-openbsd-56b879ee2c52abf05d341489c8929c4f4527e5d9.zip
Pass bootduid (from disklabel) on the bootline to the kernel
ok kettenis
-rw-r--r--distrib/powerpc64/ramdisk/install.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/powerpc64/ramdisk/install.md b/distrib/powerpc64/ramdisk/install.md
index 280869a186b..57184d36ded 100644
--- a/distrib/powerpc64/ramdisk/install.md
+++ b/distrib/powerpc64/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.2 2020/07/05 21:03:49 kettenis Exp $
+# $OpenBSD: install.md,v 1.3 2020/07/10 17:04:49 deraadt Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,14 +37,15 @@ NEWFSARGS_msdos="-F 16 -L boot"
MOUNT_ARGS_msdos="-o-l"
md_installboot() {
- local _disk=/dev/$1
+ local _disk=/dev/$1, _duid
+ _duid=$(disklabel $1 | sed -ne 's/^duid: \(.*\)/\1/p')
# Mount MSDOS partition, copy boot kernel and create menu entry
mount ${MOUNT_ARGS_msdos} ${_disk}i /mnt/mnt
cp /mnt/bsd /mnt/mnt/boot
cat > /mnt/mnt/grub.cfg <<-__EOT
menuentry "OpenBSD" {
- linux /boot
+ linux /boot bootduid=${_duid}
initrd /boot
}
__EOT