summaryrefslogtreecommitdiff
path: root/distrib/arm64
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2022-03-06 19:35:23 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2022-03-06 19:35:23 +0000
commitf1fde76126a7dffe4f1638a6aae0b6cbd863f796 (patch)
tree55082ecd83eb6440f8888e2138408b151ccd5c90 /distrib/arm64
parent9fda5dd3e99155fadbee27e2fb92ffd9dcc18aff (diff)
Simple move firmware subdirectory in place as suggested by deraadt@
Improved chicken scratches from tb@
Diffstat (limited to 'distrib/arm64')
-rw-r--r--distrib/arm64/ramdisk/install.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md
index cae323d372b..926eebe5e62 100644
--- a/distrib/arm64/ramdisk/install.md
+++ b/distrib/arm64/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.26 2022/03/06 19:09:29 kettenis Exp $
+# $OpenBSD: install.md,v 1.27 2022/03/06 19:35:22 kettenis Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -195,7 +195,7 @@ md_consoleinfo() {
CSPEED=115200;;
esac
- _fw=$(dmesgtail | sed -n 's!^bwfm0: failed.*/\(.*\),.*$!\1!p' | grep -m 1 "")
+ _fw=$(dmesgtail | sed -n '\!^bwfm0: failed!{s!^.*/\(.*\),.*$!\1!p;q;}')
case $(sysctl -n machdep.compatible) in
apple,*)
make_dev sd0
@@ -203,8 +203,7 @@ md_consoleinfo() {
rm -rf /usr/mdec/rpi
tar -x -C /etc/firmware \
-f /mnt2/vendorfw/firmware.tar "*$_fw*"
- mkdir -p /etc/firmware/apple-bwfm
- mv /etc/firmware/brcm/* /etc/firmware/apple-bwfm/
+ mv /etc/firmware/brcm /etc/firmware/apple-bwfm
umount /mnt2
fi
esac