path: root/discover/udev.c
diff options
authorJeremy Kerr <>2014-04-04 13:05:18 +0800
committerJeremy Kerr <>2014-04-07 11:49:08 +0800
commitae3c354e844698bdb4ed35a6845aa9dca1e9205f (patch)
treeb741aa698f1b48d4bf3a42ac696cb1a6d6920465 /discover/udev.c
parent3fa256bb478f2b3e6316c561169190457b21e616 (diff)
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 <>
Diffstat (limited to 'discover/udev.c')
1 files changed, 9 insertions, 14 deletions
diff --git a/discover/udev.c b/discover/udev.c
index 7db36a7..9e1a5ce 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -263,23 +263,18 @@ static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev)
static int udev_handle_dev_action(struct udev_device *dev, const char *action)
struct pb_udev *udev = udev_get_userdata(udev_device_get_udev(dev));
+ struct udev_list_entry *list;
+ const char *name;
-#ifdef DEBUG
- {
- struct udev_list_entry *list;
- const char *name;
- list = udev_device_get_properties_list_entry(dev);
- name = udev_device_get_sysname(dev);
+ list = udev_device_get_properties_list_entry(dev);
+ name = udev_device_get_sysname(dev);
- pb_debug("%s: action %s, device %s\n", __func__, action, name);
- pb_debug("%s properties:\n", __func__);
+ pb_debug("udev: action %s, device %s\n", action, name);
+ pb_debug("udev: properties:\n");
- for (; list; list = udev_list_entry_get_next(list))
- pb_log("\t%-20s: %s\n", udev_list_entry_get_name(list),
- udev_list_entry_get_value(list));
- } while (0);
+ for (; list; list = udev_list_entry_get_next(list))
+ pb_debug("\t%-20s: %s\n", udev_list_entry_get_name(list),
+ udev_list_entry_get_value(list));
if (!strcmp(action, "add"))
return udev_handle_dev_add(udev, dev);
OpenPOWER on IntegriCloud