diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2020-05-18 06:20:45 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2020-05-18 06:20:45 +0000 |
| commit | b6287cef9243e06e73ff157fa843467499f51489 (patch) | |
| tree | f53b1c0b07457ce24a80636a6bca250f8abd5b21 /distrib/armv7 | |
| parent | 03cd8ca6a4b3c9251b72129bd2a13e6bf56cf2f3 (diff) | |
Make ffs2 the default for newfs; change all calls to create e.g. floppy
filesystems or ramdisks to use explicit -O 1; installer already does that.
ok sthen@
Diffstat (limited to 'distrib/armv7')
| -rw-r--r-- | distrib/armv7/miniroot/Makefile.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc index c454c20dd8c..84d75484f0d 100644 --- a/distrib/armv7/miniroot/Makefile.inc +++ b/distrib/armv7/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.26 2020/05/17 17:04:27 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.27 2020/05/18 06:20:43 otto Exp $ FS= miniroot-${BOARD}-${OSrev}.img FSSIZE= 67584 # ffs+msdos, actually @@ -22,7 +22,7 @@ ${FS}: bsd.rd 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 echo 'a a\n\n\n\nw\nq\n' | disklabel -E `cat vnd` >/dev/null - newfs -t msdos -L boot /dev/r`cat vnd`i + newfs -O 1 -t msdos -L boot /dev/r`cat vnd`i mount -o-l /dev/`cat vnd`i ${MOUNT_POINT} .for DTB in ${DTBS} @@ -49,7 +49,7 @@ ${FS}: bsd.rd cp /usr/mdec/BOOTARM.EFI ${MOUNT_POINT}/efi/boot/bootarm.efi umount ${MOUNT_POINT} - newfs -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a + newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} install -c -m 555 -o root -g wheel bsd.rd ${MOUNT_POINT}/bsd ln ${MOUNT_POINT}/bsd ${MOUNT_POINT}/bsd.rd |