Author: avg
Date: Sun Nov  1 17:40:05 2009
New Revision: 198758
URL: http://svn.freebsd.org/changeset/base/198758

Log:
  MFC 197658: print machine in kernel boot version string
  
  PR:           kern/126926

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/kern/init_main.c

Modified: stable/8/sys/kern/init_main.c
==============================================================================
--- stable/8/sys/kern/init_main.c       Sun Nov  1 17:37:03 2009        
(r198757)
+++ stable/8/sys/kern/init_main.c       Sun Nov  1 17:40:05 2009        
(r198758)
@@ -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[] =
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to