From d8240a1aea33d2c5956cf460f5674aadd9da62e6 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 29 Jan 2008 10:03:45 +0000 Subject: [PATCH] If we don't have any branding, then add some uname info at startup. --- src/rc/rc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/rc/rc.c b/src/rc/rc.c index 790362f5..293cc8c9 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -687,8 +687,9 @@ int main (int argc, char **argv) (strcmp (RUNLEVEL, "S") == 0 || strcmp (RUNLEVEL, "1") == 0)) { - /* OK, we're either in runlevel 1 or single user mode */ + struct utsname uts; + /* OK, we're either in runlevel 1 or single user mode */ #ifdef __linux__ char *cmd; #endif @@ -700,15 +701,18 @@ int main (int argc, char **argv) run_script (INITEARLYSH); uname (&uts); - printf ("\n %sOpenRC %s" VERSION "%s is starting up %s%s%s\n\n", + printf ("\n %sOpenRC %s" VERSION "%s is starting up %s", ecolor (ECOLOR_GOOD), ecolor (ECOLOR_HILITE), - ecolor (ECOLOR_NORMAL), ecolor (ECOLOR_BRACKET), + ecolor (ECOLOR_NORMAL), ecolor (ECOLOR_BRACKET)); #ifdef BRANDING - BRANDING + printf (BRANDING " (%s)", uts.arch); #else - "" -#endif - , ecolor (ECOLOR_NORMAL)); + printf ("%s %s (%s)", + uts.sysname, + uts.release, + uts.machine); +#endif + printf ("%s\n\n", ecolor (ECOLOR_NORMAL)); if (! rc_yesno (getenv ("EINFO_QUIET")) && rc_conf_yesno ("rc_interactive"))