OS-8370 Welcome MNX (fix loader & onbld copyright)

Portions contributed by: Brian Bennett <brian.bennett@joyent.com>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Brian Bennett <brian.bennett@joyent.com>
Approved by: Brian Bennett <brian.bennett@joyent.com>

7 files changed, 20 insertions, 16 deletions

diff --git a/boot.manifest b/boot.manifest
index c29acdb396..4ccf8e489d 100644
--- a/boot.manifest
+++ b/boot.manifest
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2019 Joyent, Inc.
+# Copyright 2022 MNX Cloud, Inc.
 #
 
 #
@@ -43,10 +44,10 @@ f boot/forth/shortcuts.4th 0444 root sys
 f boot/forth/support.4th 0444 root sys
 f boot/forth/version.4th 0444 root sys
 f boot/gptzfsboot 0444 root sys
-f boot/joyent.png 0444 root sys
 f boot/loader 0444 root sys
 f boot/loader64.efi 0555 root sys
 f boot/loader.help 0444 root sys
 f boot/loader.rc 0444 root sys
 f boot/pmbr 0444 root sys
 f boot/triton.png 0444 root sys
+f boot/triton-logo.png 0444 root sys
diff --git a/usr/src/boot/forth/Makefile b/usr/src/boot/forth/Makefile
index 714584a532..5d43a4e9ad 100644
--- a/usr/src/boot/forth/Makefile
+++ b/usr/src/boot/forth/Makefile
@@ -12,6 +12,7 @@
 #
 # Copyright 2022 Toomas Soome <tsoome@me.com>
 # Copyright 2022 Joyent, Inc.
+# Copyright 2022 MNX Cloud, Inc.
 #
 include $(SRC)/Makefile.master
 
@@ -54,7 +55,7 @@ FORTH +=	support.4th
 FORTH +=	version.4th
 FILES +=	illumos-logo.png
 FILES +=	illumos-brand.png
-FILES +=	joyent.png
+FILES +=	triton-logo.png
 FILES +=	triton.png
 FILES +=	loader.rc
 
@@ -69,10 +70,10 @@ $(ROOT_BOOT)/%: % $(ROOT_BOOT)
 $(ROOT_BOOT_DEFAULTS)/%: % $(ROOT_BOOT_DEFAULTS)
 	$(INS.file)
 
-$(ROOT_BOOT_FORTH)/menu.rc: joyent.menu.rc $(ROOT_BOOT_FORTH)
+$(ROOT_BOOT_FORTH)/menu.rc: triton.menu.rc $(ROOT_BOOT_FORTH)
 	$(RM) $@; \
-	$(INS) -s -m $(FILEMODE) -f $(@D) joyent.menu.rc; \
-	$(MV) $(@D)/joyent.menu.rc $@
+	$(INS) -s -m $(FILEMODE) -f $(@D) triton.menu.rc; \
+	$(MV) $(@D)/triton.menu.rc $@
 
 $(ROOT_BOOT_FORTH)/%: % $(ROOT_BOOT_FORTH)
 	$(INS.file)
diff --git a/usr/src/boot/forth/brand-smartos.4th b/usr/src/boot/forth/brand-smartos.4th
index be492462a0..acdbcf13af 100644
--- a/usr/src/boot/forth/brand-smartos.4th
+++ b/usr/src/boot/forth/brand-smartos.4th
@@ -11,6 +11,7 @@
 
 \
 \ Copyright 2019 Joyent, Inc.
+\ Copyright 2022 MNX Cloud, Inc.
 \
 
 2 brandX ! 1 brandY ! \ Initialize brand placement defaults
@@ -21,17 +22,17 @@
 	1+ \ increase y for next time we're called
 ;
 
-: brand ( x y -- ) \ "joyent" [wide] logo in B/W (7 rows x 42 columns)
+: brand ( x y -- ) \ "triton" [wide] logo in B/W (7 rows x 42 columns)
 
-	0 1 1 0 0 s" /boot/joyent.png" fb-putimage if 2drop exit then
+	0 1 1 0 0 s" /boot/triton-logo.png" fb-putimage if 2drop exit then
 
-	s"       #                                   " brand+
-	s"       #  ####  #   # ###### #    # #####  " brand+
-	s"       # #    #  # #  #      ##   #   #    " brand+
-	s"       # #    #   #   #####  # #  #   #    " brand+
-	s" #     # #    #   #   #      #  # #   #    " brand+
-	s" #     # #    #   #   #      #   ##   #    " brand+
-	s"  #####   ####    #   ###### #    #   #  TM" brand+
+	s"                                           " brand+
+	s" #####  ####   #  #####   ###   #   #      " brand+
+	s"   #    #   #  #    #    #   #  ##  #      " brand+
+	s"   #    ####   #    #    #   #  # # #      " brand+
+	s"   #    # #    #    #    #   #  #  ##      " brand+
+	s"   #    #  #   #    #    #   #  #  ##      " brand+
+	s"   #    #   #  #    #     ###   #   # TM   " brand+
 
 	2drop
 ;
diff --git a/usr/src/boot/forth/joyent.png b/usr/src/boot/forth/joyent.png
deleted file mode 100644
index b375a88192..0000000000
--- a/usr/src/boot/forth/joyent.png
+++ /dev/null
diff --git a/usr/src/boot/forth/triton-logo.png b/usr/src/boot/forth/triton-logo.png
new file mode 100644
index 0000000000..79e917b1e8
--- /dev/null
+++ b/usr/src/boot/forth/triton-logo.png
diff --git a/usr/src/boot/forth/joyent.menu.rc b/usr/src/boot/forth/triton.menu.rc
index 3dddb7ffe7..3dddb7ffe7 100644
--- a/usr/src/boot/forth/joyent.menu.rc
+++ b/usr/src/boot/forth/triton.menu.rc
diff --git a/usr/src/tools/onbld/Checks/Copyright.py b/usr/src/tools/onbld/Checks/Copyright.py
index b358484c2b..48b44e59ae 100644
--- a/usr/src/tools/onbld/Checks/Copyright.py
+++ b/usr/src/tools/onbld/Checks/Copyright.py
@@ -26,6 +26,7 @@
 
 # Copyright 2008, 2010, Richard Lowe
 # Copyright 2019 Joyent, Inc.
+# Copyright 2022 MNX Cloud, Inc.
 
 # Make sure there is a copyright claim for the current year.
 
@@ -38,7 +39,7 @@ def is_copyright(line):
 	return re.search(r'Copyright (?!\[yyyy\])', line)
 
 def is_current_copyright(line):
-	return re.search(r'Copyright %s Joyent, Inc.$' % time.strftime('%Y'), line)
+	return re.search(r'Copyright %s MNX Cloud, Inc.$' % time.strftime('%Y'), line)
 
 def copyright(fh, filename=None, output=sys.stderr):
 	ret = rights = goodrights = 0
@@ -57,7 +58,7 @@ def copyright(fh, filename=None, output=sys.stderr):
 		err(output, "no copyright message found", filename)
 		ret = 1
 	elif goodrights == 0:
-		err(output, "'Copyright %s Joyent, Inc.' not found" %
+		err(output, "'Copyright %s MNX Cloud, Inc.' not found" %
 		    time.strftime('%Y'), filename)
 		ret = 1