diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-09-25 23:19:01 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-09-25 23:19:01 +0000 |
| commit | ffe75b8d4259ab91d1bd42c464ac2ceba22eb404 (patch) | |
| tree | 368d8786e60bb530d6f57d14ffc1831445d2a4e2 /sys | |
| parent | 5d28f75c8db6529a2f7afa5744a39153bb64af54 (diff) | |
| download | FreeBSD-src-ffe75b8d4259ab91d1bd42c464ac2ceba22eb404.zip FreeBSD-src-ffe75b8d4259ab91d1bd42c464ac2ceba22eb404.tar.gz | |
Add "FreeBSD" trademark statement to copyright section of boot messages.
MFC after: 3 days
Approved by: core, board at FreeBSDFoundation dot org
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/init_main.c | 7 | ||||
| -rw-r--r-- | sys/sys/copyright.h | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index e37aed7..b7ad38c 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -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 diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h index 8e65e40..87c8bb8 100644 --- a/sys/sys/copyright.h +++ b/sys/sys/copyright.h @@ -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 |
