same diff for the other daemons which have log_verbose() and
don't already handle this case:- bgpd dvmrpd ospf6d iscsid ldpd ripd.
iscsid currently only supports increasing log level via iscsictl,
so I've added the -v flag there (including usage/manual).
I haven't looked at these yet, they don't have log_verbose:
ifstated ntpd rtadvd sasyncd snmpd ypldap
Index: bgpd/bgpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.c,v
retrieving revision 1.167
diff -u -p -r1.167 bgpd.c
--- bgpd/bgpd.c 1 May 2011 10:42:28 -0000 1.167
+++ bgpd/bgpd.c 20 Aug 2011 12:12:55 -0000
@@ -118,6 +118,7 @@ main(int argc, char *argv[])
bgpd_process = PROC_MAIN;
log_init(1); /* log to stderr until daemonized */
+ log_verbose(1);
bzero(&conf, sizeof(conf));
LIST_INIT(&mrt_l);
@@ -183,6 +184,7 @@ main(int argc, char *argv[])
errx(1, "unknown user %s", BGPD_USER);
log_init(debug);
+ log_verbose(conf.opts & BGPD_OPT_VERBOSE);
if (!debug)
daemon(1, 0);
Index: bgpd/log.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/log.c,v
retrieving revision 1.54
diff -u -p -r1.54 log.c
--- bgpd/log.c 18 Nov 2010 12:51:24 -0000 1.54
+++ bgpd/log.c 20 Aug 2011 12:12:55 -0000
@@ -71,7 +71,6 @@ log_init(int n_debug)
extern char *__progname;
debug = n_debug;
- verbose = n_debug;
if (!debug)
openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
Index: dvmrpd/dvmrpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/dvmrpd/dvmrpd.c,v
retrieving revision 1.13
diff -u -p -r1.13 dvmrpd.c
--- dvmrpd/dvmrpd.c 8 Feb 2010 00:36:20 -0000 1.13
+++ dvmrpd/dvmrpd.c 20 Aug 2011 12:12:55 -0000
@@ -129,6 +129,7 @@ main(int argc, char *argv[])
dvmrpd_process = PROC_MAIN;
log_init(1); /* log to stderr until daemonized */
+ log_verbose(1);
while ((ch = getopt(argc, argv, "df:nv")) != -1) {
switch (ch) {
@@ -159,6 +160,7 @@ main(int argc, char *argv[])
usage();
log_init(debug);
+ log_verbose(opts & DVMRPD_OPT_VERBOSE);
/* multicast IP forwarding must be enabled */
mib[0] = CTL_NET;
Index: dvmrpd/log.c
===================================================================
RCS file: /cvs/src/usr.sbin/dvmrpd/log.c,v
retrieving revision 1.2
diff -u -p -r1.2 log.c
--- dvmrpd/log.c 2 Nov 2009 20:31:50 -0000 1.2
+++ dvmrpd/log.c 20 Aug 2011 12:12:55 -0000
@@ -45,7 +45,6 @@ log_init(int n_debug)
extern char *__progname;
debug = n_debug;
- verbose = n_debug;
if (!debug)
openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
Index: ospf6d/log.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospf6d/log.c,v
retrieving revision 1.6
diff -u -p -r1.6 log.c
--- ospf6d/log.c 22 Dec 2009 17:45:47 -0000 1.6
+++ ospf6d/log.c 20 Aug 2011 12:12:55 -0000
@@ -51,7 +51,6 @@ log_init(int n_debug)
extern char *__progname;
debug = n_debug;
- verbose = n_debug;
if (!debug)
openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
Index: ospf6d/ospf6d.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospf6d/ospf6d.c,v
retrieving revision 1.21
diff -u -p -r1.21 ospf6d.c
--- ospf6d/ospf6d.c 22 Aug 2010 21:15:25 -0000 1.21
+++ ospf6d/ospf6d.c 20 Aug 2011 12:12:55 -0000
@@ -135,6 +135,7 @@ main(int argc, char *argv[])
ospfd_process = PROC_MAIN;
log_init(1); /* log to stderr until daemonized */
+ log_verbose(1);
while ((ch = getopt(argc, argv, "cdD:f:nv")) != -1) {
switch (ch) {
@@ -210,6 +211,7 @@ main(int argc, char *argv[])
errx(1, "unknown user %s", OSPF6D_USER);
log_init(debug);
+ log_verbose(ospfd_conf->opts & OSPFD_OPT_VERBOSE);
if (!debug)
daemon(1, 0);
Index: iscsid/iscsid.8
===================================================================
RCS file: /cvs/src/usr.sbin/iscsid/iscsid.8,v
retrieving revision 1.3
diff -u -p -r1.3 iscsid.8
--- iscsid/iscsid.8 25 Sep 2010 14:09:52 -0000 1.3
+++ iscsid/iscsid.8 20 Aug 2011 12:12:55 -0000
@@ -22,7 +22,7 @@
.Nd "iSCSI (Internet SCSI) daemon"
.Sh SYNOPSIS
.Nm
-.Op Fl d
+.Op Fl dv
.Op Fl n Ar device
.Op Fl s Ar socket
.Sh DESCRIPTION
@@ -52,6 +52,8 @@ will run in the foreground and log to
Use an alternate /dev entry for communicating with the kernel.
.It Fl s Ar socket
Use an alternate location for the default control socket.
+.It Fl v
+Produce more verbose output.
.El
.Sh FILES
.Bl -tag -width "/var/run/iscsid.sockXX" -compact
Index: iscsid/iscsid.c
===================================================================
RCS file: /cvs/src/usr.sbin/iscsid/iscsid.c,v
retrieving revision 1.7
diff -u -p -r1.7 iscsid.c
--- iscsid/iscsid.c 4 May 2011 21:00:04 -0000 1.7
+++ iscsid/iscsid.c 20 Aug 2011 12:12:55 -0000
@@ -68,11 +68,12 @@ main(int argc, char *argv[])
struct passwd *pw;
char *ctrlsock = ISCSID_CONTROL;
char *vscsidev = ISCSID_DEVICE;
- int ch, debug = 0;
+ int ch, debug = 0, verbose = 0;
log_init(1); /* log to stderr until daemonized */
+ log_verbose(1);
- while ((ch = getopt(argc, argv, "dn:s:")) != -1) {
+ while ((ch = getopt(argc, argv, "dn:s:v")) != -1) {
switch (ch) {
case 'd':
debug = 1;
@@ -83,6 +84,9 @@ main(int argc, char *argv[])
case 's':
ctrlsock = optarg;
break;
+ case 'v':
+ verbose = 1;
+ break;
default:
usage();
/* NOTREACHED */
@@ -100,6 +104,8 @@ main(int argc, char *argv[])
errx(1, "need root privileges");
log_init(debug);
+ log_verbose(verbose);
+
if (!debug)
daemon(1, 0);
log_info("startup");
@@ -173,7 +179,7 @@ usage(void)
{
extern char *__progname;
- fprintf(stderr, "usage: %s [-d] [-n device] [-s socket]\n",
+ fprintf(stderr, "usage: %s [-dv] [-n device] [-s socket]\n",
__progname);
exit(1);
}
Index: iscsid/log.c
===================================================================
RCS file: /cvs/src/usr.sbin/iscsid/log.c,v
retrieving revision 1.4
diff -u -p -r1.4 log.c
--- iscsid/log.c 27 Apr 2011 18:59:01 -0000 1.4
+++ iscsid/log.c 20 Aug 2011 12:12:55 -0000
@@ -47,7 +47,6 @@ log_init(int n_debug)
extern char *__progname;
debug = n_debug;
- verbose = n_debug;
if (!debug)
openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
Index: ldpd/ldpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldpd/ldpd.c,v
retrieving revision 1.12
diff -u -p -r1.12 ldpd.c
--- ldpd/ldpd.c 1 Sep 2010 13:54:54 -0000 1.12
+++ ldpd/ldpd.c 20 Aug 2011 12:12:55 -0000
@@ -134,6 +134,7 @@ main(int argc, char *argv[])
ldpd_process = PROC_MAIN;
log_init(1); /* log to stderr until daemonized */
+ log_verbose(1);
while ((ch = getopt(argc, argv, "dD:f:nv")) != -1) {
switch (ch) {
@@ -155,7 +156,6 @@ main(int argc, char *argv[])
if (opts & LDPD_OPT_VERBOSE)
opts |= LDPD_OPT_VERBOSE2;
opts |= LDPD_OPT_VERBOSE;
- log_verbose(1);
break;
default:
usage();
@@ -189,6 +189,7 @@ main(int argc, char *argv[])
errx(1, "unknown user %s", LDPD_USER);
log_init(debug);
+ log_verbose(opts & LDPD_OPT_VERBOSE);
if (!debug)
daemon(1, 0);
Index: ldpd/log.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldpd/log.c,v
retrieving revision 1.8
diff -u -p -r1.8 log.c
--- ldpd/log.c 2 Sep 2010 14:34:04 -0000 1.8
+++ ldpd/log.c 20 Aug 2011 12:12:55 -0000
@@ -49,7 +49,6 @@ log_init(int n_debug)
extern char *__progname;
debug = n_debug;
- verbose = n_debug;
if (!debug)
openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
Index: ripd/log.c
===================================================================
RCS file: /cvs/src/usr.sbin/ripd/log.c,v
retrieving revision 1.3
diff -u -p -r1.3 log.c
--- ripd/log.c 2 Nov 2009 20:28:49 -0000 1.3
+++ ripd/log.c 20 Aug 2011 12:12:55 -0000
@@ -44,7 +44,6 @@ log_init(int n_debug)
extern char *__progname;
debug = n_debug;
- verbose = n_debug;
if (!debug)
openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
Index: ripd/ripd.c
===================================================================
RCS file: /cvs/src/usr.sbin/ripd/ripd.c,v
retrieving revision 1.20
diff -u -p -r1.20 ripd.c
--- ripd/ripd.c 8 Feb 2010 00:26:51 -0000 1.20
+++ ripd/ripd.c 20 Aug 2011 12:12:55 -0000
@@ -129,6 +129,7 @@ main(int argc, char *argv[])
ripd_process = PROC_MAIN;
log_init(1); /* log to stderr until daemonized */
+ log_verbose(1);
while ((ch = getopt(argc, argv, "cdD:f:nv")) != -1) {
switch (ch) {
@@ -200,6 +201,7 @@ main(int argc, char *argv[])
errx(1, "unknown user %s", RIPD_USER);
log_init(debug);
+ log_verbose(conf->opts & RIPD_OPT_VERBOSE);
if (!debug)
daemon(1, 0);
