log: Allow runtime selection of 'debug' log level

Currently, we need to compile with -DDEBUG to implement debug-level
logging in the UIs and discover server.

Since we may not be able to easily replace a system's petitboot
binaries, this change introduces a -v|--verbose option to the discver
server and ncurses UI, which enables debug at runtime. We also move some
of the udev debug code out of an #ifdef DEBUG block.

Since petitboot is generally started on boot, we also add a little
infrastructure to pass -v to petitboot on certain system contitions:
either petitboot.debug on the kernel command line, or a petitboot,debug?
NVRAM property containing the value 'true'.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

1 files changed, 11 insertions, 2 deletions

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 713d99d..e895f47 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -29,7 +29,7 @@ static void print_usage(void)
 	print_version();
 	printf(
 "Usage: pb-discover [-a, --no-autoboot] [-h, --help] [-l, --log log-file]\n"
-"                   [-n, --dry-run] [-V, --version]\n");
+"                   [-n, --dry-run] [-v, --verbose] [-V, --version]\n");
 }
 
 /**
@@ -48,6 +48,7 @@ struct opts {
 	const char *log_file;
 	enum opt_value dry_run;
 	enum opt_value show_version;
+	enum opt_value verbose;
 };
 
 /**
@@ -61,14 +62,16 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		{"help",           no_argument,       NULL, 'h'},
 		{"log",            required_argument, NULL, 'l'},
 		{"dry-run",        no_argument,       NULL, 'n'},
+		{"verbose",        no_argument,       NULL, 'v'},
 		{"version",        no_argument,       NULL, 'V'},
 		{ NULL, 0, NULL, 0},
 	};
-	static const char short_options[] = "ahl:nV";
+	static const char short_options[] = "ahl:nvV";
 	static const struct opts default_values = {
 		.no_autoboot = opt_no,
 		.log_file = "/var/log/petitboot/pb-discover.log",
 		.dry_run = opt_no,
+		.verbose = opt_no,
 	};
 
 	*opts = default_values;
@@ -93,6 +96,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		case 'n':
 			opts->dry_run = opt_yes;
 			break;
+		case 'v':
+			opts->verbose = opt_yes;
+			break;
 		case 'V':
 			opts->show_version = opt_yes;
 			break;
@@ -147,6 +153,9 @@ int main(int argc, char *argv[])
 	}
 	pb_log_init(log);
 
+	if (opts.verbose)
+		pb_log_set_debug(true);
+
 	pb_log("--- pb-discover ---\n");
 
 	/* we look for closed sockets when we write, so ignore SIGPIPE */