From 90303e031054c4e8b32ec33c13dc375244a4eea9 Mon Sep 17 00:00:00 2001
From: jerry <jerry@opensolaris.(none)>
Date: Tue, 2 Nov 2010 07:41:18 -0600
Subject: include Joyent in copyright output

---
 usr/src/cmd/init/init.c         | 2 ++
 usr/src/cmd/prtconf/prtconf.c   | 4 ++--
 usr/src/uts/common/os/logsubr.c | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'usr/src')

diff --git a/usr/src/cmd/init/init.c b/usr/src/cmd/init/init.c
index e04bbecd89..17aaf69ddb 100644
--- a/usr/src/cmd/init/init.c
+++ b/usr/src/cmd/init/init.c
@@ -696,6 +696,8 @@ main(int argc, char *argv[])
 		console(B_FALSE,
 		    "Copyright (c) 1983, 2010, Oracle and/or its affiliates."
 		    " All rights reserved.\r\n");
+		console(B_FALSE,
+		    "Copyright (c) 2010, Joyent. All rights reserved.\r\n");
 	}
 
 	/*
diff --git a/usr/src/cmd/prtconf/prtconf.c b/usr/src/cmd/prtconf/prtconf.c
index 8b6c8f3a9a..4ff967fffb 100644
--- a/usr/src/cmd/prtconf/prtconf.c
+++ b/usr/src/cmd/prtconf/prtconf.c
@@ -342,10 +342,10 @@ main(int argc, char *argv[])
 	/*
 	 * If 0 bytes are returned (the system returns '1', for the \0),
 	 * we're probably on x86, and there has been no si-hw-provider
-	 * set in /etc/bootrc, default to Oracle.
+	 * set in /etc/bootrc, default to Joyent.
 	 */
 	if (ret <= 1) {
-		(void) strncpy(hw_provider, "Oracle Corporation",
+		(void) strncpy(hw_provider, "Joyent",
 		    sizeof (hw_provider));
 	}
 	(void) printf("System Configuration:  %s  %s\n", hw_provider,
diff --git a/usr/src/uts/common/os/logsubr.c b/usr/src/uts/common/os/logsubr.c
index f5cebbf82e..c450346f2f 100644
--- a/usr/src/uts/common/os/logsubr.c
+++ b/usr/src/uts/common/os/logsubr.c
@@ -250,6 +250,7 @@ log_init(void)
 	    utsname.release, utsname.version, NBBY * (uint_t)sizeof (void *));
 	printf("Copyright (c) 1983, 2010, Oracle and/or its affiliates. "
 	    "All rights reserved.\n");
+	printf("Copyright (c) 2010, Joyent. All rights reserved.\n");
 #ifdef DEBUG
 	printf("DEBUG enabled\n");
 #endif
-- 
cgit v1.2.3