From 6d1c2459851c410d698dbfd53366e1c4624b782f Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sat, 30 Dec 2017 21:56:24 +0100 Subject: [PATCH] Update documentation, `debug` replaces `--debug` and `finit_debug` Signed-off-by: Joachim Nilsson --- doc/bootstrap.md | 2 +- doc/build.md | 6 +++--- src/finit.c | 2 +- src/log.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/bootstrap.md b/doc/bootstrap.md index 76abd56a..a4c9d1f9 100644 --- a/doc/bootstrap.md +++ b/doc/bootstrap.md @@ -5,7 +5,7 @@ Bootstrap 2. Set up initial signal handlers 3. Set up default $PATH early 4. Mount `/proc` and `/sys` -5. Check kernel command line for `--debug` to figure out log level +5. Check kernel command line for `debug` to figure out log level 6. Load all `.so` plugins 7. Call `fsck` on file systems listed in `/etc/fstab` 8. Populate `/dev` using either udev or mdev, depending on system type diff --git a/doc/build.md b/doc/build.md index ea292dbd..85863943 100644 --- a/doc/build.md +++ b/doc/build.md @@ -127,11 +127,11 @@ Remember to also set up an initial `/etc/finit.conf` before rebooting! Debugging --------- -Add `finit_debug`, or `--debug`, to the kernel command line to enable -debug messages. +Edit, or append to, the kernel command line: remove `quiet` to enable +kernel messages and add `debug` to enable Finit debug messages. ```shell -append="init=/sbin/finit --debug" +append="init=/sbin/finit debug" ``` To debug startup issues, in particular issues with getty/login, try diff --git a/src/finit.c b/src/finit.c index cd9e9208..0c9a9cf7 100644 --- a/src/finit.c +++ b/src/finit.c @@ -187,7 +187,7 @@ static void emergency_shell(void) } fprintf(stderr, "\n=> Embarrassingly, Finit has crashed. Check /dev/kmsg for details.\n"); - fprintf(stderr, "=> To debug, add '--debug' to the kernel command line.\n\n"); + fprintf(stderr, "=> To debug, add 'debug' to the kernel command line.\n\n"); /* * Become session leader and set controlling TTY diff --git a/src/log.h b/src/log.h index 3891f1ff..38754ab5 100644 --- a/src/log.h +++ b/src/log.h @@ -33,7 +33,7 @@ * errors and debug messages. For all other user messages, see logit() * * The default log level is LOG_NOTICE. To toggle LOG_DEBUG messages, - * use `initctl debug` or add `--debug` to the kernel cmdline. + * use `initctl debug` or add `debug` to the kernel cmdline. */ #define _d(fmt, args...) logit(LOG_DEBUG, "%s():" fmt "\n", __func__, ##args) #define _w(fmt, args...) logit(LOG_WARNING, "%s():" fmt "\n", __func__, ##args)