Drop confusing splash cmdline and --enable-progress configure option

This patch reverts back to the progress/status behavior of Finit < v3.0
because this is what most users expect, including the maintainer.  The
resulting code and configure script is a lot simpler to understand and
maintain:

- No more --enable-progress or --enable-progress-classic configure
  flags.  Instead a progress_style variable in helpers.c that can
  be changed at compile time for those that really need it.
- No more 'splash' kernel commnand line option.  This turned out to
  be *very* confusing to many users who believed it was some sort of
  graphical splash screen à la Plymouth.

Also, when Finit debug is enabled we now have a global 'debug' flag
which now alo controls if klogctl() should be called to prevent the
kernel logs to the console or not.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2021-02-14 20:11:08 +01:00
1 parent 13a33d345b
commit 35e4e0d073
13 files changed
+55 -130

No files matched your search

+5 -8
View File
@@ -75,20 +75,17 @@ static void hide_args(int argc, char *argv[])
}
}
static void parse_arg(char *arg, int *dbg)
static void parse_arg(char *arg)
{
/* Catches finit_debug (deprecated), --debug, and debug */
/* Catches finit_debug, --debug, and debug */
if (strstr(arg, "debug"))
*dbg = 1;
debug = 1;
if (string_compare(arg, "rescue") || string_compare(arg, "recover"))
rescue = 1;
if (string_compare(arg, "single") || string_compare(arg, "S"))
single = 1;
if (string_compare(arg, "splash"))
splash = 1;
}
void conf_parse_cmdline(int argc, char *argv[])
@@ -98,7 +95,7 @@ void conf_parse_cmdline(int argc, char *argv[])
char line[LINE_SIZE], *cmdline, *tok;
for (int i = 1; i < argc; i++)
parse_arg(argv[i], &dbg);
parse_arg(argv[i]);
hide_args(argc, argv);
@@ -116,7 +113,7 @@ void conf_parse_cmdline(int argc, char *argv[])
while ((tok = strtok(cmdline, " \t"))) {
cmdline = NULL;
parse_arg(tok, &dbg);
parse_arg(tok);
}
fclose(fp);