diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-04-12 16:08:42 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-04-12 16:08:42 -0400 |
| commit | 4ba6055b96f45aaeeef02ff684d83f4c328b729d (patch) | |
| tree | 0bd1927d294cbedc57579970e5c11b44335875e0 | |
| parent | cf14beb483b337cbdb0e8ae5016ad10cd2359e23 (diff) | |
| parent | a59162b335579e92b5b36ee9847e31c0102680e8 (diff) | |
| download | illumos-joyent-4ba6055b96f45aaeeef02ff684d83f4c328b729d.tar.gz | |
Merge branch 'master' into triton-logo
| -rw-r--r-- | usr/src/cmd/Adm/sun/issue.in | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/os/logsubr.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/usr/src/cmd/Adm/sun/issue.in b/usr/src/cmd/Adm/sun/issue.in index d9957b7a0d..06404ce335 100644 --- a/usr/src/cmd/Adm/sun/issue.in +++ b/usr/src/cmd/Adm/sun/issue.in @@ -1,7 +1,7 @@ [37m[1m*[31m--[0m[31m+--[37m[1m*[0m[33m--[37m[1m*[0m - [31m|[1m\[0m [31m|[0m[31m\ |[33m\ [1m|\[0m J O Y E N T + [31m|[1m\[0m [31m|[0m[31m\ |[33m\ [1m|\[0m [31m| [1m\[0m[31m|[0m [31m\| [33m\[1m| \[0m [37;47m#####[0m [37;47m####[0m [37;47m#[0m [37;47m#####[0m [37;47m###[0m [37;47m#[0m [37;47m#[0m TM [31m+--[1m[37m*[31m--+[0m[33m--[1m[37m*[33m--[37m*[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m##[0m [37;47m#[0m [37m|[31m\ |\ |\ [33m|[1m\ |[0m [37;47m#[0m [37;47m####[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m [37;47m#[0m diff --git a/usr/src/uts/common/os/logsubr.c b/usr/src/uts/common/os/logsubr.c index e365ad26b6..6a922343e7 100644 --- a/usr/src/uts/common/os/logsubr.c +++ b/usr/src/uts/common/os/logsubr.c @@ -24,6 +24,7 @@ * Copyright (c) 2013 Gary Mills * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2022 Joyent, Inc. + * Copyright 2022 MNX Cloud, Inc. */ #include <sys/types.h> @@ -261,7 +262,11 @@ log_init(void) #ifdef LEGACY_BANNER printf("\rSunOS Release %s Version %s %u-bit\n", utsname.release, utsname.version, NBBY * (uint_t)sizeof (void *)); - printf("Copyright 2010-2022 Joyent, Inc.\n"); + /* + * Note: In the future this should be 2022-20XX, and delete this + * comment when we don't need it anymore + */ + printf("Copyright 2022 MNX Cloud, Inc.\n"); #else bootbanner_print(log_bootbanner_print, KM_SLEEP); #endif |