summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2022-02-04 16:08:40 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2022-02-04 16:08:40 +0000
commitd9788e0217b1721ed43f9ccf9bf7e17eaad2992e (patch)
tree392c0a03fc74f0f82e5d93832f412b1e9e77102b /distrib
parent051800f19896c12fc09d1869d6d539c0288afa19 (diff)
Now that installboot(8) creates the startup.nsh file, remove the shell
scripting doing the same thing from here. ok deraadt@, visa@
Diffstat (limited to 'distrib')
-rw-r--r--distrib/arm64/ramdisk/install.md9
1 files changed, 4 insertions, 5 deletions
diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md
index d50bee57b8b..fae0f4e1383 100644
--- a/distrib/arm64/ramdisk/install.md
+++ b/distrib/arm64/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.23 2021/12/14 11:01:58 kettenis Exp $
+# $OpenBSD: install.md,v 1.24 2022/02/04 16:08:39 kettenis Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,10 +49,7 @@ md_installboot() {
exit
fi
- # Mount MSDOS partition to do some final tweaks
- mount ${MOUNT_ARGS_msdos} ${_disk}i /mnt/mnt
- echo bootaa64.efi > /mnt/mnt/efi/boot/startup.nsh
-
+ # Apply some final tweaks on selected platforms
_mdec=/usr/mdec/$_plat
case $_plat in
@@ -61,6 +58,7 @@ md_installboot() {
bs=1024 seek=8 >/dev/null 2>&1
;;
rpi)
+ mount ${MOUNT_ARGS_msdos} ${_disk}i /mnt/mnt
cp $_mdec/{bootcode.bin,start*.elf,fixup*.dat,*.dtb} /mnt/mnt/
cp $_mdec/u-boot.bin /mnt/mnt/
mkdir -p /mnt/mnt/overlays
@@ -73,6 +71,7 @@ md_installboot() {
kernel=u-boot.bin
__EOT
fi
+ umount /mnt/mnt
;;
esac
}