Having -f implied by -d (and --trace) usually saves some typing, but
debug mode in background (with a log file) is quite useful if pasta
is started by Podman, and is probably going to be handy for passt
with libvirt later, too.
Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
---
conf.c | 7 +++----
passt.1 | 5 ++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/conf.c b/conf.c
index 598c711..90214f5 100644
--- a/conf.c
+++ b/conf.c
@@ -636,7 +636,7 @@ static void usage(const char *name)
info("");
- info( " -d, --debug Be verbose, don't run in background");
+ info( " -d, --debug Be verbose");
info( " --trace Be extra verbose, implies --debug");
info( " -q, --quiet Don't print informational messages");
info( " -f, --foreground Don't run in background");
@@ -1192,7 +1192,7 @@ void conf(struct ctx *c, int argc, char **argv)
usage(argv[0]);
}
- c->trace = c->debug = c->foreground = 1;
+ c->trace = c->debug = 1;
break;
case 12:
if (runas) {
@@ -1233,7 +1233,6 @@ void conf(struct ctx *c, int argc, char **argv)
}
c->debug = 1;
- c->foreground = 1;
break;
case 'e':
if (logfile) {
@@ -1275,7 +1274,7 @@ void conf(struct ctx *c, int argc, char **argv)
c->quiet = 1;
break;
case 'f':
- if (c->foreground && !c->debug) {
+ if (c->foreground) {
err("Multiple --foreground options given");
usage(argv[0]);
}
diff --git a/passt.1 b/passt.1
index 92c4ce2..d121050 100644
--- a/passt.1
+++ b/passt.1
@@ -79,12 +79,11 @@ for performance reasons.
.TP
.BR \-d ", " \-\-debug
-Be verbose, don't run in background, don't log to the system logger.
+Be verbose, don't log to the system logger.
.TP
.BR \-\-trace
-Be extra verbose, show single packets, don't run in background. Implies
-\fB--debug\fR.
+Be extra verbose, show single packets. Implies \fB--debug\fR.
.TP
.BR \-q ", " \-\-quiet
--
2.35.1