Use installboot -p in install.md for macppc, powerpc64

ok kn@

diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 39483b1..b20f324 100644 (file)
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#      $OpenBSD: install.md,v 1.75 2022/08/31 19:38:42 kn Exp $
+#      $OpenBSD: install.md,v 1.76 2022/09/11 04:38:28 gkoehler Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -106,8 +106,7 @@ __EOT
                esac
        done
 
-       disklabel $_disk 2>/dev/null | grep -q "^  i:" || disklabel -w -d $_disk
-       newfs -t msdos ${_disk}i
+       installboot -p $_disk
 }
 
 md_prep_HFS() {

diff --git a/distrib/powerpc64/ramdisk/install.md b/distrib/powerpc64/ramdisk/install.md
index e95aa5b..77e0fe2 100644 (file)
--- a/distrib/powerpc64/ramdisk/install.md
+++ b/distrib/powerpc64/ramdisk/install.md
@@ -1,4 +1,4 @@
-#      $OpenBSD: install.md,v 1.9 2022/02/10 15:12:57 krw Exp $
+#      $OpenBSD: install.md,v 1.10 2022/09/11 04:38:28 gkoehler Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -33,7 +33,6 @@
 #
 
 NCPU=$(sysctl -n hw.ncpufound)
-NEWFSARGS_msdos="-F 16 -L boot"
 
 md_installboot() {
        if ! installboot -r /mnt ${1}; then
@@ -50,7 +49,6 @@ md_prep_fdisk() {
        local bootsectorstart="32768"
        local bootsectorsize="32768"
        local bootfstype="msdos"
-       local newfs_args=${NEWFSARGS_msdos}
 
        while :; do
                _d=whole
@@ -65,8 +63,7 @@ md_prep_fdisk() {
                        echo -n "Creating a ${bootfstype} partition and an OpenBSD partition for rest of $_disk..."
                        fdisk -iy -b "${bootsectorsize}@${bootsectorstart}:${bootparttype}" ${_disk} >/dev/null
                        echo "done."
-                       disklabel $_disk 2>/dev/null | grep -q "^  i:" || disklabel -w -d $_disk
-                       newfs -t ${bootfstype} ${newfs_args} ${_disk}i
+                       installboot -p $_disk
                        return ;;
                [eE]*)
                        # Manually configure the MBR.