d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add "FreeBSD" trademark statement to copyright section of boot messages.

Browse Source 
MFC after:	3 days
Approved by:	core, board at FreeBSDFoundation dot org
This commit is contained in:
Robert Watson 2006-09-25 23:19:01 +00:00
parent fa81ece897
commit 5add74b4a7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/init_main.c
View File

@ -289,19 +289,20 @@ print_caddr_t(void *data __unused)
printf("%s", (char *)data);
}
SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, copyright)
SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_SECOND, print_caddr_t, version)
SYSINIT(trademark, SI_SUB_COPYRIGHT, SI_ORDER_SECOND, print_caddr_t, trademark)
SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_THIRD, print_caddr_t, version)
#ifdef WITNESS
static char wit_warn[] =
"WARNING: WITNESS option enabled, expect reduced performance.\n";
SYSINIT(witwarn, SI_SUB_COPYRIGHT, SI_ORDER_SECOND + 1,
SYSINIT(witwarn, SI_SUB_COPYRIGHT, SI_ORDER_THIRD + 1,
print_caddr_t, wit_warn)
#endif
#ifdef DIAGNOSTIC
static char diag_warn[] =
"WARNING: DIAGNOSTIC option enabled, expect reduced performance.\n";
SYSINIT(diagwarn, SI_SUB_COPYRIGHT, SI_ORDER_SECOND + 2,
SYSINIT(diagwarn, SI_SUB_COPYRIGHT, SI_ORDER_FOURTH + 2,
print_caddr_t, diag_warn)
#endif

5
sys/sys/copyright.h
View File

@ -32,6 +32,10 @@
#define COPYRIGHT_FreeBSD \
"Copyright (c) 1992-2006 The FreeBSD Project.\n"
/* Foundation */
#define TRADEMARK_Foundation \
"FreeBSD is a registered trademark of The FreeBSD Foundation.\n"
/* Berkeley */
#define COPYRIGHT_UCB \
"Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994\n\tThe Regents of the University of California. All rights reserved.\n"
@ -45,4 +49,5 @@ char copyright[] = COPYRIGHT_FreeBSD COPYRIGHT_PC98 COPYRIGHT_UCB;
#else
char copyright[] = COPYRIGHT_FreeBSD COPYRIGHT_UCB;
char trademark[] = TRADEMARK_Foundation;
#endif