summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2007-04-13 17:34:41 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2007-04-13 17:34:41 +0000
commitaaadc3febf45ff292d15ca0da9ace923293833ed (patch)
treed07b1482b76432aca003468d90e61f594484fdd7
parentd49a4ab20340009afee5741854fcc2ef8a167471 (diff)
Update install media generation to the new semantics of the -c flag.
Also replace "newfs -O" with "newfs -O 0" now that -O takes an option.
Diffstat
-rw-r--r--distrib/alpha/bsd.rd/Makefile6
-rw-r--r--distrib/alpha/common/Makefile.inc6
-rw-r--r--distrib/amd64/common/Makefile.inc6
-rw-r--r--distrib/armish/ramdisk/Makefile4
-rw-r--r--distrib/hp300/ramdisk/Makefile4
-rw-r--r--distrib/hppa/ramdisk/Makefile4
-rw-r--r--distrib/i386/common/Makefile.inc12
-rw-r--r--distrib/i386/ramdisk_cd/Makefile4
-rw-r--r--distrib/landisk/miniroot/Makefile2
-rw-r--r--distrib/landisk/ramdisk/Makefile4
-rw-r--r--distrib/luna88k/ramdisk/Makefile4
-rw-r--r--distrib/mac68k/ramdisk/Makefile4
-rw-r--r--distrib/macppc/ramdisk/Makefile4
-rw-r--r--distrib/mvme68k/ramdisk/Makefile4
-rw-r--r--distrib/mvme88k/ramdisk/Makefile4
-rw-r--r--distrib/mvmeppc/ramdisk/Makefile4
-rw-r--r--distrib/ramdisk/Makefile8
-rw-r--r--distrib/sgi/ramdisk/Makefile4
-rw-r--r--distrib/sparc64/bsd.rd/Makefile8
-rw-r--r--distrib/sparc64/common/Makefile.inc6
-rw-r--r--distrib/sparc64/ramdisk/Makefile6
-rw-r--r--distrib/sparc64/ramdiskB/Makefile6
-rw-r--r--distrib/vax/common/Makefile.inc6
-rw-r--r--distrib/vax/ramdisk/Makefile.inc6
-rw-r--r--distrib/zaurus/ramdisk/Makefile4
-rw-r--r--share/doc/smm/01.setup/2.t4
-rw-r--r--sys/arch/i386/stand/Makefile4
27 files changed, 69 insertions, 69 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 382165772b0..50d65826941 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile,v 1.10 2007/04/13 17:34:39 millert Exp $
TOP= ${.CURDIR}/..
@@ -36,8 +36,8 @@ NBLKS= 5744
# old format, minfree, opt, b/i trks, sects, cpg
NEWFSARGS= -t ffs -m 0 -o space
-NEWFSARGS_RD= -i 8192 -c 80
-NEWFSARGS_FD= -i 524288 -c 80
+NEWFSARGS_RD= -i 8192
+NEWFSARGS_FD= -i 524288 -c ${FLOPPYBLKS}
bsd.rd: bsd.rd_unz
objcopy -Sg -R .comment bsd.rd_unz bsd.strip
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 3f8552cf818..8fbbeef5307 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.15 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -37,8 +37,8 @@ NBLKS= 5744
# old format, minfree, opt, b/i trks, sects, cpg
NEWFSARGS= -t ffs -m 0 -o space
-NEWFSARGS_RD= -i 16384 -c 80
-NEWFSARGS_FD= -i 524288 -e 2000 -g 100000 -h 2 -a 10000
+NEWFSARGS_RD= -i 16384
+NEWFSARGS_FD= -i 524288 -c ${FLOPPYBLKS}
${FLOPPY}: bsd.gz
dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYBLKS}
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc
index 8c0c76e27c9..f6955e7ea34 100644
--- a/distrib/amd64/common/Makefile.inc
+++ b/distrib/amd64/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -30,7 +30,7 @@ ${FS}: bsd.gz
dd if=/dev/zero of=${REALIMAGE} bs=10k count=${FLOPPYSIZE}
vnconfig -v -c ${VND} ${REALIMAGE}
disklabel -w -r ${VND} ${FLOPPYTYPE}
- newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV}
+ newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
cp ${BOOT} ${.OBJDIR}/boot
strip ${.OBJDIR}/boot
@@ -50,7 +50,7 @@ ${FS}: bsd.gz
DISKTYPE?= rdroot
NBLKS?= 3584
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space -i 4096
bsd.gz: bsd.rd
cp bsd.rd bsd.strip
diff --git a/distrib/armish/ramdisk/Makefile b/distrib/armish/ramdisk/Makefile
index bd96ee17b7a..3127d646739 100644
--- a/distrib/armish/ramdisk/Makefile
+++ b/distrib/armish/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2006/06/28 20:17:04 drahn Exp $
+# $OpenBSD: Makefile,v 1.3 2007/04/13 17:34:40 millert Exp $
REV= ${OSrev}
@@ -26,7 +26,7 @@ DISKTYPE= rdroot2.5M
#NBLKS= 8192
NBLKS= 5120
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space -i 4096
.ifndef DESTDIR
all ${IMAGE}:
diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile
index 668c2a31b6d..7f0dcd03b9f 100644
--- a/distrib/hp300/ramdisk/Makefile
+++ b/distrib/hp300/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile,v 1.23 2007/04/13 17:34:40 millert Exp $
# $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $
TOP= ${.CURDIR}/..
@@ -29,7 +29,7 @@ install: bsd.rd
DISKTYPE= rdroot
NBLKS= 4096
-NEWFSARGS= -m 0 -o space -c 16 -i 3072
+NEWFSARGS= -m 0 -o space -i 3072
bsd.rd: rdsetroot
.ifndef(NOBUILD)
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 77bf74c0a5f..a3df5d6a99d 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile,v 1.10 2007/04/13 17:34:40 millert Exp $
CBIN= instbin
ARCHDIR= ${.CURDIR}/..
@@ -40,7 +40,7 @@ GZIPFLAGS?= -9n
# old format, minfree, opt, b/i trks, sects, cpg
NEWFSOPTS= -t ffs -m 0 -o space -f 1024 -b 8192
-NEWFSOPTS_RD?= ${NEWFSOPTS} -i 4096 -c 64 -s ${IMAGESIZE}
+NEWFSOPTS_RD?= ${NEWFSOPTS} -i 4096 -s ${IMAGESIZE}
all: bsd.rd ${LIF} ${CDROM}
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 387a593720a..39dc5fbafcf 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.16 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.17 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -21,16 +21,16 @@ VND_CRDEV= /dev/r${VND}c
PID!= echo $$$$
REALIMAGE!= echo /var/tmp/image.${PID}
BOOT= ${DESTDIR}/usr/mdec/boot
-FLOPPYSIZE?= 144
+FLOPPYSIZE?= 2880
FLOPPYTYPE?= floppy3
all: ${FS}
${FS}: bsd.gz
- dd if=/dev/zero of=${REALIMAGE} bs=10k count=${FLOPPYSIZE}
+ dd if=/dev/zero of=${REALIMAGE} bs=512 count=${FLOPPYSIZE}
vnconfig -v -c ${VND} ${REALIMAGE}
disklabel -w -r ${VND} ${FLOPPYTYPE}
- newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV}
+ newfs -m 0 -o space -i 81920 -c ${FLOPPYSIZE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
cp ${BOOT} ${.OBJDIR}/boot
strip ${.OBJDIR}/boot
@@ -49,8 +49,8 @@ ${FS}: bsd.gz
DISKTYPE?= rdroot
NBLKS?= 3800
-# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+# minfree, opt, b/i, blks/cyl
+NEWFSARGS= -m 0 -o space -i 4096
bsd.gz: bsd.rd
cp bsd.rd bsd.strip
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index 9cf8ffc8fe5..1afc385f8b8 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2004/01/28 21:46:38 tom Exp $
+# $OpenBSD: Makefile,v 1.4 2007/04/13 17:34:40 millert Exp $
.PATH: ${.CURDIR}/../ramdisk
RAMDISK=RAMDISK_CD
-FLOPPYSIZE=288
+FLOPPYSIZE=5760
FLOPPYTYPE=floppy288
XNAME=cdrom
diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile
index ce3fb6e4421..90c120e34b5 100644
--- a/distrib/landisk/miniroot/Makefile
+++ b/distrib/landisk/miniroot/Makefile
@@ -16,7 +16,7 @@ DISKTYPE= miniroot2.5M
#NBLKS= 8192
NBLKS= 5120
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space -i 4096
.ifndef DESTDIR
diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile
index 00168f7328d..d1f70da1661 100644
--- a/distrib/landisk/ramdisk/Makefile
+++ b/distrib/landisk/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2006/11/13 08:42:06 deraadt Exp $
+# $OpenBSD: Makefile,v 1.7 2007/04/13 17:34:40 millert Exp $
REV= ${OSrev}
@@ -25,7 +25,7 @@ DISKTYPE= rdroot2.5M
#NBLKS= 8192
NBLKS= 5120
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space -i 4096
.ifndef DESTDIR
all ${IMAGE}:
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile
index 682ba8afdfe..2a3f0185024 100644
--- a/distrib/luna88k/ramdisk/Makefile
+++ b/distrib/luna88k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2004/12/11 14:04:10 martin Exp $
+# $OpenBSD: Makefile,v 1.3 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -22,7 +22,7 @@ PID!= echo $$$$
DISKTYPE= rdroot
NBLKS= 4096
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -t ffs -m 0 -o space -u 32 -c 16
+NEWFSARGS= -t ffs -m 0 -o space
all: ${BSD_RD}
diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile
index c5a7a24dc6f..a5acea51c8e 100644
--- a/distrib/mac68k/ramdisk/Makefile
+++ b/distrib/mac68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2006/02/28 19:24:43 miod Exp $
+# $OpenBSD: Makefile,v 1.9 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -21,7 +21,7 @@ PID!= echo $$$$
DISKTYPE= rdroot
NBLKS= 2880
-NEWFSARGS= -t ffs -m 0 -o space -u 32 -c 16 -b 4096
+NEWFSARGS= -t ffs -m 0 -o space -b 4096
all: ${BSD_RD}
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index e6fa20c80e2..82e0e173651 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile,v 1.18 2007/04/13 17:34:40 millert Exp $
REV= ${OSrev}
@@ -25,7 +25,7 @@ PID!= echo $$$$
DISKTYPE= rdroot
NBLKS= 8192
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space -i 4096
.ifndef DESTDIR
all ${IMAGE}:
diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile
index d1dc5393900..1d30e86808d 100644
--- a/distrib/mvme68k/ramdisk/Makefile
+++ b/distrib/mvme68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/12/11 14:04:11 martin Exp $
+# $OpenBSD: Makefile,v 1.19 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -22,7 +22,7 @@ PID!= echo $$$$
DISKTYPE= rdroot
NBLKS= 4096
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -t ffs -m 0 -o space -u 32 -c 16
+NEWFSARGS= -t ffs -m 0 -o space
all: ${BSD_RD}
diff --git a/distrib/mvme88k/ramdisk/Makefile b/distrib/mvme88k/ramdisk/Makefile
index 146ee2d8cc7..209eee71c8d 100644
--- a/distrib/mvme88k/ramdisk/Makefile
+++ b/distrib/mvme88k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2004/12/11 14:04:11 martin Exp $
+# $OpenBSD: Makefile,v 1.8 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -22,7 +22,7 @@ PID!= echo $$$$
DISKTYPE= rdroot
NBLKS= 4096
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -t ffs -m 0 -o space -u 32 -c 16
+NEWFSARGS= -t ffs -m 0 -o space
all: ${BSD_RD}
diff --git a/distrib/mvmeppc/ramdisk/Makefile b/distrib/mvmeppc/ramdisk/Makefile
index 5d6b0a06fae..b11171aef72 100644
--- a/distrib/mvmeppc/ramdisk/Makefile
+++ b/distrib/mvmeppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile,v 1.8 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -22,7 +22,7 @@ PID!= echo $$$$
DISKTYPE= rdroot
NBLKS= 8192
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space
.ifndef DESTDIR
all ${IMAGE}:
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 1fca97a8271..6a631093ccf 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2007/02/16 16:56:22 tsi Exp $
+# $OpenBSD: Makefile,v 1.29 2007/04/13 17:34:40 millert Exp $
REV= ${OSrev}
@@ -46,9 +46,9 @@ RAWLABEL?= -r
# old format, minfree, opt, b/i trks, sects, cpg
NEWFSOPTS= -t ffs -m 0 -o space -f 1024 -b 8192
-NEWFSOPTS_RD?= ${NEWFSOPTS} -i 16384 -c 64 -s ${IMAGESIZE}
-#NEWFSOPTS_FD= ${NEWFSOPTS} -i 524288 -c 80 -s ${FLOPPYSIZE}
-NEWFSOPTS_FD= ${NEWFSOPTS} -i 1048575 -c 256 -s ${FLOPPYSIZE}
+NEWFSOPTS_RD?= ${NEWFSOPTS} -i 16384 -s ${IMAGESIZE}
+#NEWFSOPTS_FD= ${NEWFSOPTS} -i 524288 -c ${FLOPPYSIZE} -s ${FLOPPYSIZE}
+NEWFSOPTS_FD= ${NEWFSOPTS} -i 1048575 -c ${FLOPPYSIZE} -s ${FLOPPYSIZE}
.ifndef DESTDIR
all:
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index 3480b5aff8e..5f9d79d73ce 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2004/08/06 22:33:27 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2007/04/13 17:34:40 millert Exp $
REV= ${OSrev}
@@ -25,7 +25,7 @@ PID!= echo $$$$
DISKTYPE= rdroot
NBLKS= 8192
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space -i 4096
.ifndef DESTDIR
all ${IMAGE}:
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index e7a7055edab..1f952bf1d80 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile,v 1.14 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -40,8 +40,8 @@ NBLKS= 5744
# old format, minfree, opt, b/i trks, sects, cpg
NEWFSARGS= -t ffs -m 0 -o space
-NEWFSARGS_RD= -i 8192 -c 80
-NEWFSARGS_FD= -i 524288 -c 80
+NEWFSARGS_RD= -i 8192 -c ${NBLKS}
+NEWFSARGS_FD= -i 524288 -c 2880
bsd.rd: bsd.rd_unz
objcopy -Sg -R .comment bsd.rd_unz bsd.strip
@@ -70,7 +70,7 @@ do_prep:
disklabel -w -r ${VND} ${DISKTYPE}
do_mount:
- newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV}
+ newfs ${NEWFSARGS} ${NEWFSARGS_RD} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
do_umount:
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index b1f38ea013c..d005e03d624 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.6 2002/04/30 09:18:20 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -31,7 +31,7 @@ ${FS}: bsd.rd
dd if=/dev/zero of=${REALIMAGE} bs=10k count=${FLOPPYSIZE}
vnconfig -v -c ${VND} ${REALIMAGE}
disklabel -w -r ${VND} ${FLOPPYTYPE}
- newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV}
+ newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
@@ -48,7 +48,7 @@ ${FS}: bsd.rd
DISKTYPE?= rdroot
NBLKS?= 3510
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space -i 4096
${IMAGE}: ${CBIN} rd_setup do_files rd_teardown
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 5f6067986df..4cde8a27b50 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile,v 1.17 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -42,7 +42,7 @@ STRIP?= strip
DISKTYPE= rdroot
NBLKS= 6144
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 8192
+NEWFSARGS= -m 0 -o space -i 8192
.ifndef DESTDIR
all ${IMAGE}:
@@ -60,7 +60,7 @@ ${FLOPPY}: bsd.gz ${BOOT} /usr/
dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
vnconfig -v -c ${VND} ${REALIMAGE}
disklabel -w ${RAWLABEL} ${VND} ${FLOPPYTYPE}
- newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV}
+ newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
cp ${DESTDIR}/usr/mdec/ofwboot ${MOUNT_POINT}/
cp bsd.gz ${MOUNT_POINT}/bsd
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index e06ae7644de..d91dec64f17 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile,v 1.11 2007/04/13 17:34:40 millert Exp $
TOP= ${.CURDIR}/..
@@ -42,7 +42,7 @@ STRIP?= strip
DISKTYPE= rdroot
NBLKS= 6144
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 8192
+NEWFSARGS= -m 0 -o space -i 8192
.ifndef DESTDIR
all ${IMAGE}:
@@ -60,7 +60,7 @@ ${FLOPPY}: bsd.gz ${BOOT} /usr/
dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
vnconfig -v -c ${VND} ${REALIMAGE}
disklabel -w ${RAWLABEL} ${VND} ${FLOPPYTYPE}
- newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV}
+ newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
cp ${DESTDIR}/usr/mdec/ofwboot ${MOUNT_POINT}/
cp bsd.gz ${MOUNT_POINT}/bsd
diff --git a/distrib/vax/common/Makefile.inc b/distrib/vax/common/Makefile.inc
index 5081a25d2c4..82b8a69a5ed 100644
--- a/distrib/vax/common/Makefile.inc
+++ b/distrib/vax/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2002/04/30 07:23:29 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2007/04/13 17:34:40 millert Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -22,7 +22,7 @@ all: ${CBIN} bootroot
dd if=/dev/zero of=${IMAGE} bs=64k count=32
vnconfig -v -c ${VND} ${IMAGE}
disklabel -w ${VND} miniroot
- newfs -O -m 0 -o space -i 8192 ${VND_RDEV}
+ newfs -O 0 -m 0 -o space -i 8192 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
@@ -39,7 +39,7 @@ bootroot: xxboot boot
dd if=/dev/zero of=${BOOTSYS} bs=512 count=8192
vnconfig -v -c ${VND} ${BOOTSYS}
disklabel -w ${VND} bootroot
- newfs -O -m 0 -o space -i 8192 ${VND_RDEV}
+ newfs -O 0 -m 0 -o space -i 8192 ${VND_RDEV}
dd if=xxboot of=${VND_RDEV} count=16
mount ${VND_DEV} ${MOUNT_POINT}
cp boot ${MOUNT_POINT}
diff --git a/distrib/vax/ramdisk/Makefile.inc b/distrib/vax/ramdisk/Makefile.inc
index e252c199eab..206324f6ac7 100644
--- a/distrib/vax/ramdisk/Makefile.inc
+++ b/distrib/vax/ramdisk/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2007/04/09 14:55:11 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2007/04/13 17:34:40 millert Exp $
IMAGESIZE= 3072
GZIPCMD?= gzip
@@ -8,9 +8,9 @@ MAKEFLOPPY= 1
RAWLABEL=
#STRIP= echo
#NEWFS_WILL_FAIL= true
-#NEWFSOPTS_RD= -t ffs -m 0 -o space -f 1024 -i 16384 -c 4 -s 8192
+#NEWFSOPTS_RD= -t ffs -m 0 -o space -f 1024 -i 16384 -s 8192
HOSTCCFLAGS= -DDEBUG -O0
#HOSTCCFLAGS= -DBROKEN_NMAGIC -DDEBUG
BOOTXX= ${DESTDIR}/usr/mdec/sdboot
INSTALLBOOT= @true -- # totally incredible
-NEWFSOPTS_RD= ${NEWFSOPTS} -i 4096 -c 64 -s ${IMAGESIZE}
+NEWFSOPTS_RD= ${NEWFSOPTS} -i 4096 -s ${IMAGESIZE}
diff --git a/distrib/zaurus/ramdisk/Makefile b/distrib/zaurus/ramdisk/Makefile
index f0fa78f5fd1..4faf28db9e1 100644
--- a/distrib/zaurus/ramdisk/Makefile
+++ b/distrib/zaurus/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2004/12/31 00:14:07 drahn Exp $
+# $OpenBSD: Makefile,v 1.2 2007/04/13 17:34:40 millert Exp $
REV= ${OSrev}
@@ -26,7 +26,7 @@ DISKTYPE= rdroot2.5M
#NBLKS= 8192
NBLKS= 5120
# minfree, opt, b/i trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
+NEWFSARGS= -m 0 -o space -i 4096
.ifndef DESTDIR
all ${IMAGE}:
diff --git a/share/doc/smm/01.setup/2.t b/share/doc/smm/01.setup/2.t
index da0382e287e..cb62ad19d2a 100644
--- a/share/doc/smm/01.setup/2.t
+++ b/share/doc/smm/01.setup/2.t
@@ -1,4 +1,4 @@
-.\" $OpenBSD: 2.t,v 1.3 2003/06/02 23:30:11 millert Exp $
+.\" $OpenBSD: 2.t,v 1.4 2007/04/13 17:34:40 millert Exp $
.\"
.\" Copyright (c) 1988, 1993 The Regents of the University of California.
.\" All rights reserved.
@@ -708,7 +708,7 @@ builds a filesystem that SunOS will not handle; if you
plan to switch OSes back and forth you may want to sacrifice the
performance gain from the new filesystem format for compatibility.)
You can build an old-format filesystem on \*(4B by giving the \-O
-option to
+0 option to
.Xr newfs (8).
.Xr Fsck (8)
can convert old format filesystems to new format
diff --git a/sys/arch/i386/stand/Makefile b/sys/arch/i386/stand/Makefile
index 3d6f26b3ea1..8bd42d130d2 100644
--- a/sys/arch/i386/stand/Makefile
+++ b/sys/arch/i386/stand/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2005/07/30 17:25:19 millert Exp $
+# $OpenBSD: Makefile,v 1.14 2007/04/13 17:34:40 millert Exp $
.if ${MACHINE} == "i386"
SUBDIR= etc libsa libkern libz mbr cdbr
@@ -16,6 +16,6 @@ zero-fd0:
prep-fd0:
sudo disklabel -rw fd0 floppy
- sudo newfs -O -m 0 -o space -i 3000 -c 80 /dev/rfd0a
+ sudo newfs -O 0 -m 0 -o space -i 3000 -c 80 /dev/rfd0a
.include <bsd.subdir.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 07:25:41 +0000