diff options
| author | Peter Tribble <peter.tribble@gmail.com> | 2019-05-24 10:39:16 -0700 |
|---|---|---|
| committer | Joshua M. Clulow <josh@sysmgr.org> | 2019-05-24 10:39:16 -0700 |
| commit | 1f4c6dbc37f14382f7ff4575a74da056dbd34d66 (patch) | |
| tree | 45a6fc8ffc476fbad5df34b36be83eac7ac8be06 /usr/src/cmd/sckmd | |
| parent | 7811b028df2f34164be65174d666b570b73d32c3 (diff) | |
| download | illumos-joyent-1f4c6dbc37f14382f7ff4575a74da056dbd34d66.tar.gz | |
10864 Remove starcat support
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Joshua M. Clulow <josh@sysmgr.org>
Diffstat (limited to 'usr/src/cmd/sckmd')
| -rw-r--r-- | usr/src/cmd/sckmd/sparc/sun4u/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/cmd/sckmd/svc-sckmd | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/usr/src/cmd/sckmd/sparc/sun4u/Makefile b/usr/src/cmd/sckmd/sparc/sun4u/Makefile index e9a415991f..fc89b4ba4a 100644 --- a/usr/src/cmd/sckmd/sparc/sun4u/Makefile +++ b/usr/src/cmd/sckmd/sparc/sun4u/Makefile @@ -21,6 +21,7 @@ # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2019 Peter Tribble. # # Makefile definitions for Sun Fire 15000 Key Management Daemon (sckmd) # @@ -50,7 +51,7 @@ $(USRPSMPROG) := FILEMODE = 0755 # # FLAGS: # -CPPFLAGS= -I$(USR_PSM_INCL_DIR) -I$(SRC)/uts/sun4u/starcat $(CPPFLAGS.master) +CPPFLAGS= -I$(USR_PSM_INCL_DIR) -I$(SRC)/uts/sun4u/opl $(CPPFLAGS.master) LINT_FLAGS= -c -Nlevel=4 -Ncheck diff --git a/usr/src/cmd/sckmd/svc-sckmd b/usr/src/cmd/sckmd/svc-sckmd index 4261c7c849..0bf66c2776 100644 --- a/usr/src/cmd/sckmd/svc-sckmd +++ b/usr/src/cmd/sckmd/svc-sckmd @@ -22,8 +22,7 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 Peter Tribble. # # @@ -33,13 +32,11 @@ . /lib/svc/share/smf_include.sh platform=${_INIT_UTS_PLATFORM:-`/sbin/uname -i`} -starcat="SUNW,Sun-Fire-15000" -opl="SUNW,SPARC-Enterprise" +opl="SUNW,SPARC-Enterprise" sckmd="/usr/platform/sun4u/lib/sckmd" -if [ ${platform} = "${starcat}" -o \ - ${platform} = "${opl}" ]; then - if [ -x ${sckmd} ]; then +if [ ${platform} = "${opl}" ]; then + if [ -x ${sckmd} ]; then ${sckmd} exit $SMF_EXIT_OK fi |