diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2023-02-10 15:54:34 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2023-02-10 15:54:34 +0000 |
| commit | 05ea373e6aa6e3cf10b2114aaa604b02274e6a10 (patch) | |
| tree | 30ec4570d49a143e98c1bdce0c29392ac92dc5f3 /distrib/powerpc64 | |
| parent | 001b12579f371214656dfbf3568903d3fad4ef49 (diff) | |
Use "echo '/ *' | disklabel -wAT-" to put all free space into the
root partition.
Identical behaviour as but more readable than the "echo 'a
a\n\n\n\nw\nq\n'| disklabel -E" it replaces.
It also eliminates the extraneous output of -E that required
">/dev/null".
ok kn@
Diffstat (limited to 'distrib/powerpc64')
| -rw-r--r-- | distrib/powerpc64/iso/Makefile | 4 | ||||
| -rw-r--r-- | distrib/powerpc64/ramdisk/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/distrib/powerpc64/iso/Makefile b/distrib/powerpc64/iso/Makefile index 9093e59f7dc..b9eb6dd499c 100644 --- a/distrib/powerpc64/iso/Makefile +++ b/distrib/powerpc64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2022/02/10 15:12:57 krw Exp $ +# $OpenBSD: Makefile,v 1.6 2023/02/10 15:54:33 krw Exp $ FS= install${OSrev}.img FSSIZE= 1032192 @@ -29,7 +29,7 @@ ${FS}: ${BASE} ${XBASE} dd if=/dev/zero of=${FS} bs=512 count=${TOTALSIZE} vnconfig -v ${FS} > vnd 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 + echo '/ *' | disklabel -wAT- `cat vnd` newfs -t msdos ${NEWFS_ARGS_msdos} /dev/r`cat vnd`i mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT} echo 'menuentry "OpenBSD install" {' > ${MOUNT_POINT}/grub.cfg diff --git a/distrib/powerpc64/ramdisk/Makefile b/distrib/powerpc64/ramdisk/Makefile index dd7a57d517b..274ce451573 100644 --- a/distrib/powerpc64/ramdisk/Makefile +++ b/distrib/powerpc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2022/02/10 15:12:57 krw Exp $ +# $OpenBSD: Makefile,v 1.5 2023/02/10 15:54:33 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 67584 @@ -25,7 +25,7 @@ ${FS}: bsd.rd dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd 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 + echo '/ *' | disklabel -wAT- `cat vnd` newfs -t msdos ${NEWFS_ARGS_msdos} /dev/r`cat vnd`i mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT} cp bsd.rd ${MOUNT_POINT}/boot |