Allow quiet mode to disable banner, also simplify default banner.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2015-06-07 16:06:23 +02:00
parent 0dd97de046
commit f8d608107c
3 changed files with 10 additions and 8 deletions
+2 -1
View File
@@ -100,7 +100,8 @@ static int set_runlevel(int lvl)
int show_version(void)
{
return banner();
puts("v" VERSION);
return 0;
}
static int show_status(void)
+5 -5
View File
@@ -60,11 +60,6 @@ int main(int argc, char* argv[])
if (getpid() != 1)
return client(argc, argv);
/*
* Hello world.
*/
banner();
/*
* Initial setup of signals, ignore all until we're up.
*/
@@ -95,6 +90,11 @@ int main(int argc, char* argv[])
*/
parse_kernel_cmdline();
/*
* Hello world.
*/
banner();
/*
* Populate /dev and prepare for runtime events from kernel.
*/
+3 -2
View File
@@ -172,14 +172,15 @@ char *runlevel_string(int levels)
*/
int banner(void)
{
if (getpid() == 1 && !verbose)
if (!verbose)
return 0;
delline();
#ifdef INIT_HEADING
echo("%s", INIT_HEADING);
#else
echo("Finit version " VERSION " (" WHOAMI ") " __DATE__ " " __TIME__);
echo("Finit v" VERSION);
echo("===================================================================");
#endif
return 0;
}