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");
}
/**
const char *log_file;
enum opt_value dry_run;
enum opt_value show_version;
+ enum opt_value verbose;
};
/**
{"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;
case 'n':
opts->dry_run = opt_yes;
break;
+ case 'v':
+ opts->verbose = opt_yes;
+ break;
case 'V':
opts->show_version = opt_yes;
break;
}
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 */
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);
-#endif
+ 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);
debug = _debug;
}
+void pb_log_set_debug(bool _debug)
+{
+ debug = _debug;
+}
+
FILE *pb_log_get_stream(void)
{
static FILE *null_stream;
#define pb_log_init(s) __pb_log_init(s, false)
#endif
+void pb_log_set_debug(bool debug);
FILE *pb_log_get_stream(void);
#endif /* _LOG_H */
print_version();
printf(
"Usage: petitboot-nc [-h, --help] [-l, --log log-file]\n"
-" [-s, --start-daemon] [-V, --version]\n");
+" [-s, --start-daemon] [-v, --verbose] [-V, --version]\n");
}
/**
enum opt_value show_help;
const char *log_file;
enum opt_value start_daemon;
+ enum opt_value verbose;
enum opt_value show_version;
};
{"help", no_argument, NULL, 'h'},
{"log", required_argument, NULL, 'l'},
{"start-daemon", no_argument, NULL, 's'},
+ {"verbose", no_argument, NULL, 'v'},
{"version", no_argument, NULL, 'V'},
{ NULL, 0, NULL, 0},
};
- static const char short_options[] = "dhl:sV";
+ static const char short_options[] = "dhl:svV";
static const struct opts default_values = { 0 };
*opts = default_values;
case 's':
opts->start_daemon = opt_yes;
break;
+ case 'v':
+ opts->verbose = opt_yes;
+ break;
case 'V':
opts->show_version = opt_yes;
break;
pb_log_init(log);
+ if (opts.verbose)
+ pb_log_set_debug(true);
+
pb_log("--- petitboot-nc ---\n");
sa.sa_handler = sig_handler;
fi
done
+verbose_opt=
+sysinfo_bin=$(dirname $0)/pb-sysinfo
+if [ -x $sysinfo_bin ] && $sysinfo_bin --debug-enabled
+then
+ verbose_opt=--verbose
+fi
+
while :
do
- $ui
+ $ui $verbose_opt
reset
echo "Exiting petitboot. Type 'exit' to return."
$shell
'--id')
tr -d '\0' < /proc/device-tree/system-id
;;
+'--debug-enabled')
+ exec >/dev/null 2>&1
+ nvram --print-config=petitboot,debug? | grep -q true && exit 0
+ grep -Fq petitboot.debug /proc/cmdline && exit 0
+ exit 1
+ ;;
esac