diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2022-02-04 18:12:48 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2022-02-04 18:12:48 +0000 |
commit | d1a198218dc2ea996e5af4fbed5c3bb9fed43bf5 (patch) | |
tree | 9340d69deec68890b3413f41e5088f751c421aad /distrib | |
parent | 8548b5d82e20acf9fe013664d6e6cd5785c436c4 (diff) |
Use the '-b' to create boot partitions instead of '-e' scripts.
Media creation & subsequent installation tests by visa@
ok visa@
Diffstat (limited to 'distrib')
-rw-r--r-- | distrib/riscv64/iso/Makefile | 6 | ||||
-rw-r--r-- | distrib/riscv64/ramdisk/Makefile | 6 | ||||
-rw-r--r-- | distrib/riscv64/ramdisk/install.md | 20 |
3 files changed, 6 insertions, 26 deletions
diff --git a/distrib/riscv64/iso/Makefile b/distrib/riscv64/iso/Makefile index 3ac0a05a3b7..8da7710e62a 100644 --- a/distrib/riscv64/iso/Makefile +++ b/distrib/riscv64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2021/06/29 22:03:50 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2022/02/04 18:12:47 krw Exp $ FS= install${OSrev}.img FSSIZE= 1032192 @@ -18,7 +18,6 @@ XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \ MSDOSSTART= 32768 MSDOSSIZE= 8192 -FFSSTART!= expr ${MSDOSSTART} + ${MSDOSSIZE} NEWFS_ARGS_msdos=-L boot -c1 -F16 MOUNT_ARGS_msdos=-o-l @@ -28,8 +27,7 @@ all: ${FS} ${FS}: ${BASE} ${XBASE} dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} vnconfig -v ${FS} > vnd - echo 'u\ne 0\nc\nn\n${MSDOSSTART}\n${MSDOSSIZE}\ne 3\nA6\nn\n${FFSSTART}\n*\nf 0\nw\nq\n' \ - | fdisk -e `cat vnd` >/dev/null + fdisk -iy -b "${MSDOSSIZE}@${MSDOSSTART}:c" `cat vnd` >/dev/null echo 'a a\n\n\n\nw\nq\n' | disklabel -E `cat vnd` >/dev/null newfs -t msdos ${NEWFS_ARGS_msdos} /dev/r`cat vnd`i mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT} diff --git a/distrib/riscv64/ramdisk/Makefile b/distrib/riscv64/ramdisk/Makefile index c3aed053d45..e126b2660c8 100644 --- a/distrib/riscv64/ramdisk/Makefile +++ b/distrib/riscv64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2021/07/26 12:47:46 kn Exp $ +# $OpenBSD: Makefile,v 1.5 2022/02/04 18:12:47 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 67584 @@ -9,7 +9,6 @@ RAMDISK= RAMDISK MSDOSSTART= 32768 MSDOSSIZE= 8192 -FFSSTART!= expr ${MSDOSSTART} + ${MSDOSSIZE} NEWFS_ARGS_msdos=-L boot -c1 -F16 MOUNT_ARGS_msdos=-o-l @@ -25,8 +24,7 @@ all: ${FS} ${FS}: bsd.rd dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd - echo 'u\ne 0\nc\nn\n${MSDOSSTART}\n${MSDOSSIZE}\ne 3\nA6\nn\n${FFSSTART}\n*\nf 0\nw\nq\n' \ - | fdisk -e `cat vnd` >/dev/null + fdisk -iy -b "${MSDOSSIZE}@${MSDOSSTART}:c" `cat vnd` >/dev/null echo 'a a\n\n\n\nw\nq\n' | disklabel -E `cat vnd` >/dev/null newfs -t msdos ${NEWFS_ARGS_msdos} /dev/r`cat vnd`i mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT} diff --git a/distrib/riscv64/ramdisk/install.md b/distrib/riscv64/ramdisk/install.md index 5c83395f2f4..c30d8e41051 100644 --- a/distrib/riscv64/ramdisk/install.md +++ b/distrib/riscv64/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.4 2022/02/03 10:27:33 visa Exp $ +# $OpenBSD: install.md,v 1.5 2022/02/04 18:12:47 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -48,7 +48,6 @@ md_prep_fdisk() { local bootparttype="C" local bootsectorstart="32768" local bootsectorsize="32768" - local bootsectorend=$(($bootsectorstart + $bootsectorsize)) local bootfstype="msdos" while :; do @@ -62,22 +61,7 @@ md_prep_fdisk() { case $resp in [wW]*) echo -n "Creating a ${bootfstype} partition and an OpenBSD partition for rest of $_disk..." - fdisk -e ${_disk} <<__EOT >/dev/null -reinit -e 0 -${bootparttype} -n -${bootsectorstart} -${bootsectorsize} -f 0 -e 3 -A6 -n -${bootsectorend} - -write -quit -__EOT + fdisk -iy -b "${bootsectorsize}@${bootsectorstart}:${bootparttype}" ${_disk} >/dev/null echo "done." installboot -p $_disk return ;; |