summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile.am2
-rw-r--r--utils/pb-config.c2
-rw-r--r--utils/pb-console4
-rwxr-xr-xutils/pb-sysinfo10
4 files changed, 5 insertions, 13 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am
index fde6e55..c373943 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -13,7 +13,7 @@
#
dist_sbin_SCRIPTS += utils/pb-udhcpc
-dist_pkglibexec_SCRIPTS = utils/pb-console utils/pb-sysinfo
+dist_pkglibexec_SCRIPTS = utils/pb-console
sbin_PROGRAMS += utils/pb-event utils/pb-config
utils_pb_config_LDADD = $(top_builddir)/lib/libpbcore.la \
diff --git a/utils/pb-config.c b/utils/pb-config.c
index d05538b..3bd670c 100644
--- a/utils/pb-config.c
+++ b/utils/pb-config.c
@@ -68,6 +68,8 @@ static void print_config(void *ctx, struct config *config, const char *var)
config->autoboot_timeout_sec);
print_one_config(ctx, var, "safe-mode", "%s",
config->safe_mode ? "enabled" : "disabled");
+ print_one_config(ctx, var, "debug", "%s",
+ config->debug ? "enabled" : "disabled");
}
int main(int argc, char **argv)
diff --git a/utils/pb-console b/utils/pb-console
index 1c2bf62..64bf77f 100644
--- a/utils/pb-console
+++ b/utils/pb-console
@@ -9,6 +9,7 @@ shell=sh
getty=/sbin/getty
use_getty=0
detach=0
+pb_config=pb-config
usage() {
cat >&2 <<EOF
@@ -104,8 +105,7 @@ case "$(tty)" in
esac
verbose_opt=
-sysinfo_bin=$(dirname $0)/pb-sysinfo
-if [ -x $sysinfo_bin ] && $sysinfo_bin --debug-enabled
+if $pb_config debug | grep -q enabled
then
verbose_opt=--verbose
fi
diff --git a/utils/pb-sysinfo b/utils/pb-sysinfo
deleted file mode 100755
index 7d6635c..0000000
--- a/utils/pb-sysinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-'--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
OpenPOWER on IntegriCloud