svn commit: r197658 - head/sys/kern

[Andriy Gapon]

Author: avg
Date: Thu Oct  1 10:53:12 2009
New Revision: 197658
URL: http://svn.freebsd.org/changeset/base/197658

Log:
  print machine in kernel boot version string
  
  Discussed with:	gavin, kib, jhb
  PR:		kern/126926
  MFC after:	2 weeks

Modified:
  head/sys/kern/init_main.c

Modified: head/sys/kern/init_main.c
==============================================================================
--- head/sys/kern/init_main.c	Thu Oct  1 10:46:22 2009	(r197657)
+++ head/sys/kern/init_main.c	Thu Oct  1 10:53:12 2009	(r197658)
@@ -288,11 +288,24 @@ print_caddr_t(void *data)
 {
 	printf("%s", (char *)data);
 }
+
+static void
+print_version(void *data __unused)
+{
+	int len;
+
+	/* Strip a trailing newline from version. */
+	len = strlen(version);
+	while (len > 0 && version[len - 1] == '\n')
+		len--;
+	printf("%.*s %s\n", len, version, machine);
+}
+
 SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t,
     copyright);
 SYSINIT(trademark, SI_SUB_COPYRIGHT, SI_ORDER_SECOND, print_caddr_t,
     trademark);
-SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_THIRD, print_caddr_t, version);
+SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_THIRD, print_version, NULL);
 
 #ifdef WITNESS
 static char wit_warn[] =