summaryrefslogtreecommitdiffstats
path: root/usr.sbin/makefs
diff options
context:
space:
mode:
authornatano <natano@openbsd.org>2016-10-17 07:45:32 +0000
committernatano <natano@openbsd.org>2016-10-17 07:45:32 +0000
commit65636e7286c8ed7622ddbaa5ae427bfb168a8e49 (patch)
treef0ff32b9ec0c38aa3804a728b4a46527092c6d49 /usr.sbin/makefs
parentR option doesn't compact memory at all; flags are not only useful for (diff)
downloadwireguard-openbsd-65636e7286c8ed7622ddbaa5ae427bfb168a8e49.tar.xz
wireguard-openbsd-65636e7286c8ed7622ddbaa5ae427bfb168a8e49.zip
Remove the -d option.
-d debug-mask Enable various levels of debugging, depending upon which bits are set in debug-mask. XXX: document these Useful, eh? Leaving the actual debug code in there for now, so debug flags can be set at compile time. That might be removed in the future too.
Diffstat (limited to 'usr.sbin/makefs')
-rw-r--r--usr.sbin/makefs/makefs.88
-rw-r--r--usr.sbin/makefs/makefs.c17
2 files changed, 7 insertions, 18 deletions
diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index 309d2b03119..143de8f1175 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: makefs.8,v 1.4 2016/10/16 20:45:07 natano Exp $
+.\" $OpenBSD: makefs.8,v 1.5 2016/10/17 07:45:32 natano Exp $
.\" $NetBSD: makefs.8,v 1.55 2015/11/25 16:32:00 wiz Exp $
.\"
.\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -44,7 +44,6 @@
.Nm
.Op Fl B Ar endian
.Op Fl b Ar free-blocks
-.Op Fl d Ar debug-mask
.Op Fl f Ar free-files
.Op Fl M Ar minimum-size
.Op Fl m Ar maximum-size
@@ -92,11 +91,6 @@ An optional
suffix may be provided to indicate that
.Ar free-blocks
indicates a percentage of the calculated image size.
-.It Fl d Ar debug-mask
-Enable various levels of debugging, depending upon which bits are
-set in
-.Ar debug-mask .
-XXX: document these
.It Fl f Ar free-files
Ensure that a minimum of
.Ar free-files
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index 1140cea850f..86935d41e4f 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: makefs.c,v 1.6 2016/10/16 21:59:28 tedu Exp $ */
+/* $OpenBSD: makefs.c,v 1.7 2016/10/17 07:45:32 natano Exp $ */
/* $NetBSD: makefs.c,v 1.53 2015/11/27 15:10:32 joerg Exp $ */
/*
@@ -108,7 +108,7 @@ main(int argc, char *argv[])
err(1, "Unable to get system time");
- while ((ch = getopt(argc, argv, "B:b:d:f:M:m:O:o:s:S:t:T:")) != -1) {
+ while ((ch = getopt(argc, argv, "B:b:f:M:m:O:o:s:S:t:T:")) != -1) {
switch (ch) {
case 'B':
@@ -129,10 +129,6 @@ main(int argc, char *argv[])
}
break;
- case 'd':
- debug = strtoll(optarg, NULL, 0);
- break;
-
case 'f':
len = strlen(optarg) - 1;
if (optarg[len] == '%') {
@@ -380,11 +376,10 @@ usage(fstype_t *fstype, fsinfo_t *fsoptions)
prog = getprogname();
fprintf(stderr,
-"Usage: %s [-B endian] [-b free-blocks] [-d debug-mask]\n"
-"\t[-f free-files] [-M minimum-size] [-m maximum-size]\n"
-"\t[-O offset] [-o fs-options] [-S sector-size]\n"
-"\t[-s image-size] [-T <timestamp/file>] [-t fs-type]"
-" image-file directory\n",
+"Usage: %s [-B endian] [-b free-blocks] [-f free-files]\n"
+"\t[-M minimum-size] [-m maximum-size] [-O offset]\n"
+"\t[-o fs-options] [-S sector-size] [-s image-size]\n"
+"\t[-T <timestamp/file>] [-t fs-type] image-file directory\n",
prog);
if (fstype) {