cleanup the situation around "df -i"

19 files changed, 35 insertions, 58 deletions

diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 9af69f1c65c..759970d9841 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.40 2019/04/28 16:26:07 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.41 2019/04/28 16:47:29 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -39,9 +39,7 @@ ${FLOPPY}:	bsd.gz
 	dd if=${DESTDIR}/${BOOT} of=${MOUNT_POINT}/boot bs=512
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
 	${INSTALLBOOT} ${MOUNT_POINT}/boot ${BOOTXX} `cat vnd`
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index 1f38b3ec265..d9d91e85505 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2019/04/28 14:48:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2019/04/28 16:47:29 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -24,7 +24,7 @@ vn_up: blank_filesystem
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 showit:
-	df -ki ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 
 vn_down:
 	umount ${MOUNT_POINT}
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index d7f5ea0263c..84881a1a440 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 2019/04/28 15:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.25 2019/04/28 16:47:29 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -64,10 +64,7 @@ ${FS}: ${BASE} ${XBASE} bsd.gz
 	cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
 	    ${MOUNT_POINT}/${OSREV}/${MACHINE}/SHA256
 	# XXX no SHA256.sig
-
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc
index 4f388396828..e28208f1511 100644
--- a/distrib/amd64/ramdiskA/Makefile.inc
+++ b/distrib/amd64/ramdiskA/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.11 2019/04/28 15:21:49 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.12 2019/04/28 16:47:30 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -38,9 +38,7 @@ ${FS}:	bsd.gz
 	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc
index 98977948414..b4c92c4be68 100644
--- a/distrib/amd64/ramdisk_cd/Makefile.inc
+++ b/distrib/amd64/ramdisk_cd/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.11 2019/04/28 15:21:49 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.12 2019/04/28 16:47:30 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -41,9 +41,7 @@ ${FS}:	bsd.gz
 	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/arm64/miniroot/Makefile b/distrib/arm64/miniroot/Makefile
index c9763b0f516..6b1c0455a89 100644
--- a/distrib/arm64/miniroot/Makefile
+++ b/distrib/arm64/miniroot/Makefile
@@ -71,7 +71,7 @@ rd_setup:
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
-	@df -i ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 398530a5da5..9b78c6b04b9 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.48 2019/04/28 15:21:49 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.49 2019/04/28 16:47:30 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -34,9 +34,7 @@ ${FS}:	bsd.gz
 	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 4404c69b4df..d3c29586302 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2019/04/28 15:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.18 2019/04/28 16:47:30 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -51,9 +51,7 @@ ${FS}: ${BASE} ${XBASE} bsd.gz
 	    ${MOUNT_POINT}/${OSREV}/${MACHINE}/SHA256
 	# XXX no SHA256.sig
 
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile
index 4b37bb9ed6b..acc09164e1a 100644
--- a/distrib/landisk/miniroot/Makefile
+++ b/distrib/landisk/miniroot/Makefile
@@ -39,7 +39,7 @@ rd_setup:
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
-	@df -i ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/loongson/miniroot/Makefile b/distrib/loongson/miniroot/Makefile
index 8a6e4942b5d..5204f2f9d12 100644
--- a/distrib/loongson/miniroot/Makefile
+++ b/distrib/loongson/miniroot/Makefile
@@ -31,7 +31,7 @@ rd_setup:
 	mount /dev/`cat vnd`i ${MOUNT_POINT}
 
 rd_teardown:
-	@df -i ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 	-umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/luna88k/miniroot/Makefile b/distrib/luna88k/miniroot/Makefile
index d8fc9db6a17..3f5a056ea3a 100644
--- a/distrib/luna88k/miniroot/Makefile
+++ b/distrib/luna88k/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2019/04/28 14:48:10 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2019/04/28 16:47:30 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -24,7 +24,7 @@ vn_up: blank_filesystem
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 showit:
-	df -ki ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 
 vn_down:
 	umount ${MOUNT_POINT}
diff --git a/distrib/octeon/miniroot/Makefile b/distrib/octeon/miniroot/Makefile
index ede809efdf1..f41736a48da 100644
--- a/distrib/octeon/miniroot/Makefile
+++ b/distrib/octeon/miniroot/Makefile
@@ -33,7 +33,7 @@ rd_setup:
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
-	@df -i ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index affe4dd5191..2fcbfc6462e 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.58 2019/04/28 16:26:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.59 2019/04/28 16:47:30 deraadt Exp $
 
 REV=		${OSrev}
 
@@ -54,9 +54,7 @@ ${FLOPPY}:	bsd.gz ${BOOT} ${BOOTXX}
 	mount /dev/$(cat vnd)a ${MOUNT_POINT}
 	cp bsd.gz ${MOUNT_POINT}/bsd
 	${INSTALLBOOT} -v -r ${MOUNT_POINT} $(cat vnd) ${BOOTXX} ${BOOT}
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
@@ -85,9 +83,7 @@ ${IMAGE}: instbin
 	    ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
 	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
 	rm ${MOUNT_POINT}/instbin
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index 9ed404819d8..9aa062dc0a1 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2019/04/28 15:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.19 2019/04/28 16:47:31 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -38,7 +38,7 @@ ${CDROM}:
 	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/cd-dir/boot32
 	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/cd-dir/boot64
 	umount ${.OBJDIR}/cd-dir
-	@df /dev/`cat vnd`a
+	df -i /dev/`cat vnd`a
 	vnconfig -u `cat vnd`
 	rm -f vnd
 	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=`expr ${CDFSMB} + 1 + ${SGIVOLSZ} / 2048`
diff --git a/distrib/socppc/miniroot/Makefile b/distrib/socppc/miniroot/Makefile
index dfd0304a282..15838ea8cde 100644
--- a/distrib/socppc/miniroot/Makefile
+++ b/distrib/socppc/miniroot/Makefile
@@ -35,7 +35,7 @@ rd_setup:
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
-	@df -i ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index e93fe9c15b5..56dd320311e 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.20 2019/04/28 15:21:50 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.21 2019/04/28 16:47:31 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -30,9 +30,7 @@ ${FS}:	bsd.rd
 	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
 	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTFLOPPY}
 	installboot -v `cat vnd`
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
@@ -52,7 +50,7 @@ rd_setup: instbin
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
-	@df -i ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 	-umount ${MOUNT_POINT}
 	-vnconfig -u `cat vnd`
 
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index fc5cf60ba14..a82fe231e3c 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2019/04/28 14:48:11 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2019/04/28 16:47:31 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -24,7 +24,7 @@ vn_up: blank_filesystem
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 showit:
-	df -ki ${MOUNT_POINT}
+	df -i ${MOUNT_POINT}
 
 vn_down:
 	umount ${MOUNT_POINT}
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 36d8f372d2e..e5f4dfabe1c 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.42 2019/04/28 16:26:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.43 2019/04/28 16:47:31 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -38,9 +38,7 @@ ${FLOPPY}:	bsd.gz ${BOOT} /usr/
 	cp ${DESTDIR}/usr/mdec/ofwbootfd ${MOUNT_POINT}/ofwboot
 	cp bsd.gz ${MOUNT_POINT}/bsd
 	installboot -v `cat vnd` /usr/mdec/bootblk ${MOUNT_POINT}/ofwboot
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 299c58ec282..a9ab4067129 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.36 2019/04/28 16:26:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.37 2019/04/28 16:47:31 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -38,9 +38,7 @@ ${FLOPPY}:	bsd.gz ${BOOT} /usr/
 	cp ${DESTDIR}/usr/mdec/ofwbootfd ${MOUNT_POINT}/ofwboot
 	cp bsd.gz ${MOUNT_POINT}/bsd
 	installboot -v `cat vnd` /usr/mdec/bootblk ${MOUNT_POINT}/ofwboot
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
+	df -i ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd