From 8c5eef162a07c67a544b8233f48c35954b44bd13 Mon Sep 17 00:00:00 2001
From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date: Sat, 20 Jan 2018 09:51:11 -0500
Subject: [PATCH] remove support for 'trademark files'

---
 share/man/man5/filesystem.5             | 10 ----------
 usr/src/Targetdirs                      |  1 -
 usr/src/cmd/initpkg/init.d/sysetup      |  4 ----
 usr/src/pkg/manifests/system-core-os.mf |  1 -
 4 files changed, 16 deletions(-)

diff --git a/share/man/man5/filesystem.5 b/share/man/man5/filesystem.5
index bbac967acc..863e3caed5 100644
--- a/share/man/man5/filesystem.5
+++ b/share/man/man5/filesystem.5
@@ -931,16 +931,6 @@ The analogous location for add-on system software or for applications is
 .sp
 .ne 2
 .na
-\fB\fB/etc/tm\fR\fR
-.ad
-.sp .6
-.RS 4n
-Trademark files; contents displayed at boot time.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB/etc/usb\fR\fR
 .ad
 .sp .6
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index 2e3ee47875..7d30763742 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -135,7 +135,6 @@ DIRS= \
 	/etc/svc/profile \
 	/etc/svc/profile/site \
 	/etc/svc/volatile \
-	/etc/tm  \
 	/etc/usb   \
 	/etc/user_attr.d \
 	/etc/zfs  \
diff --git a/usr/src/cmd/initpkg/init.d/sysetup b/usr/src/cmd/initpkg/init.d/sysetup
index b6fced4e9b..ceabcf23ed 100644
--- a/usr/src/cmd/initpkg/init.d/sysetup
+++ b/usr/src/cmd/initpkg/init.d/sysetup
@@ -36,10 +36,6 @@ fi
 # Uncomment this line to print the complete system configuration on startup
 #[ -x /usr/sbin/prtconf ] && /usr/sbin/prtconf
 
-# If there are trademark files, print them.
-
-[ -d /etc/tm ] && /usr/bin/cat /etc/tm/* 2>/dev/null
-
 #
 # Run rctladm to configure system resource controls based on the settings
 # previously saved by rctladm.  See rctladm(1m) for instructions on how to
diff --git a/usr/src/pkg/manifests/system-core-os.mf b/usr/src/pkg/manifests/system-core-os.mf
index ab8c5e7537..b80b3d15ab 100644
--- a/usr/src/pkg/manifests/system-core-os.mf
+++ b/usr/src/pkg/manifests/system-core-os.mf
@@ -89,7 +89,6 @@ dir path=etc/svc/profile/site group=sys
 dir path=etc/svc/volatile group=sys
 dir path=etc/sysevent group=sys
 dir path=etc/sysevent/config group=sys
-dir path=etc/tm group=sys
 dir path=etc/user_attr.d group=sys
 dir path=export group=sys
 dir path=home group=root mode=0555
-- 
2.11.4.GIT