diff options
Diffstat (limited to 'distrib/octeon')
| -rw-r--r-- | distrib/octeon/iso/Makefile | 5 | ||||
| -rw-r--r-- | distrib/octeon/ramdisk/Makefile | 7 | ||||
| -rw-r--r-- | distrib/octeon/ramdisk/install.md | 19 |
3 files changed, 9 insertions, 22 deletions
diff --git a/distrib/octeon/iso/Makefile b/distrib/octeon/iso/Makefile index bc5f2e89840..3880b47e321 100644 --- a/distrib/octeon/iso/Makefile +++ b/distrib/octeon/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2021/04/13 21:13:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2022/02/06 15:52:23 krw Exp $ FS= install${OSrev}.img FSSIZE= 832192 @@ -24,8 +24,7 @@ all: ${FS} ${FS}: ${BASE} ${XBASE} dd if=/dev/zero of=${FS} bs=512 count=${TOTALSIZE} 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 /dev/r`cat vnd`i mount /dev/`cat vnd`i ${MOUNT_POINT} diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index 7a7b74de8b1..dd34c7165b1 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2021/11/13 18:18:59 kn Exp $ +# $OpenBSD: Makefile,v 1.21 2022/02/06 15:52:23 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 24576 @@ -15,12 +15,15 @@ UTILS= ${.CURDIR}/../../miniroot MRDISKTYPE= rdroot MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096 +MSDOSSTART= 64 +MSDOSSIZE!= expr ${FSSIZE} - ${MSDOSSTART} + 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\n64\n*\nf 0\nw\nq\n' | fdisk -e `cat vnd` + fdisk -iy -b "${MSDOSSIZE}@${MSDOSSTART}:c" `cat vnd` >/dev/null echo 'w\ny\nq\n' | disklabel -E `cat vnd` > /dev/null newfs -t msdos /dev/r`cat vnd`i mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT} diff --git a/distrib/octeon/ramdisk/install.md b/distrib/octeon/ramdisk/install.md index cda3c5d3a2b..ab055dba6f7 100644 --- a/distrib/octeon/ramdisk/install.md +++ b/distrib/octeon/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.22 2020/06/27 15:35:29 deraadt Exp $ +# $OpenBSD: install.md,v 1.23 2022/02/06 15:52:23 krw Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -60,22 +60,7 @@ md_prep_fdisk() { case $resp in [wW]*) echo -n "Creating a FAT partition and an OpenBSD partition for rest of $_disk..." - fdisk -e ${_disk} <<__EOT >/dev/null -reinit -e 0 -C -n -64 -65536 -f 0 -e 3 -A6 -n -65600 - -write -quit -__EOT + fdisk -iy -b "65536@64:C" ${_disk} >/dev/null echo "done." disklabel $_disk 2>/dev/null | grep -q "^ i:" || disklabel -w -d $_disk newfs -t msdos ${_disk}i |