diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-04-28 16:47:29 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-04-28 16:47:29 +0000 |
| commit | fad8bdf900521c494af86f86e6f84e9fa2375a53 (patch) | |
| tree | f5b7d36ad19862bac5feb8f2e940052e2c8e5431 /distrib/sparc64 | |
| parent | fix misplaced hyphen in usage(); (diff) | |
| download | wireguard-openbsd-fad8bdf900521c494af86f86e6f84e9fa2375a53.tar.xz wireguard-openbsd-fad8bdf900521c494af86f86e6f84e9fa2375a53.zip | |
cleanup the situation around "df -i"
Diffstat (limited to 'distrib/sparc64')
| -rw-r--r-- | distrib/sparc64/common/Makefile.inc | 8 | ||||
| -rw-r--r-- | distrib/sparc64/miniroot/Makefile | 4 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 6 |
4 files changed, 9 insertions, 15 deletions
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 |