diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-28 11:49:17 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-28 11:49:17 +0000 |
| commit | 69833aafa8de6b8142d53d1a6f43e799e39fec21 (patch) | |
| tree | 39ce1d08822e6f7785d10f5a0b3b5f27849150ee /usr/src/cmd/svc | |
| parent | ab6a47af7ee9daefa937f7e8ca0531e68d003686 (diff) | |
| parent | 1f4c6dbc37f14382f7ff4575a74da056dbd34d66 (diff) | |
| download | illumos-joyent-69833aafa8de6b8142d53d1a6f43e799e39fec21.tar.gz | |
[illumos-gate merge]
commit 1f4c6dbc37f14382f7ff4575a74da056dbd34d66
10864 Remove starcat support
commit 7811b028df2f34164be65174d666b570b73d32c3
11066 zfs clean_mirror tests should scrub between tests
commit f006f886619b16083d53ffdfa28948267e57cccf
10502 zfs_mount_006_pos.ksh wanders outside the test area
Conflicts:
usr/src/man/man1m/Makefile
Diffstat (limited to 'usr/src/cmd/svc')
| -rw-r--r-- | usr/src/cmd/svc/profile/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/cmd/svc/profile/platform_SUNW,Sun-Fire-15000.xml | 47 |
2 files changed, 0 insertions, 48 deletions
diff --git a/usr/src/cmd/svc/profile/Makefile b/usr/src/cmd/svc/profile/Makefile index 43ee2779bd..32ec303879 100644 --- a/usr/src/cmd/svc/profile/Makefile +++ b/usr/src/cmd/svc/profile/Makefile @@ -42,7 +42,6 @@ PROFILESRCS = \ ns_nis.xml \ ns_none.xml \ platform_SUNW,SPARC-Enterprise.xml \ - platform_SUNW,Sun-Fire-15000.xml \ platform_SUNW,Sun-Fire-880.xml \ platform_SUNW,Sun-Fire.xml \ platform_SUNW,UltraSPARC-IIi-Netract.xml \ diff --git a/usr/src/cmd/svc/profile/platform_SUNW,Sun-Fire-15000.xml b/usr/src/cmd/svc/profile/platform_SUNW,Sun-Fire-15000.xml deleted file mode 100644 index 1f8b61f2e8..0000000000 --- a/usr/src/cmd/svc/profile/platform_SUNW,Sun-Fire-15000.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'> -<!-- - Copyright 2006 Sun Microsystems, Inc. All rights reserved. - Use is subject to license terms. - - CDDL HEADER START - - The contents of this file are subject to the terms of the - Common Development and Distribution License (the "License"). - You may not use this file except in compliance with the License. - - You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - or http://www.opensolaris.org/os/licensing. - See the License for the specific language governing permissions - and limitations under the License. - - When distributing Covered Code, include this CDDL HEADER in each - file and include the License file at usr/src/OPENSOLARIS.LICENSE. - If applicable, add the following below this CDDL HEADER, with the - fields enclosed by brackets "[]" replaced with your own identifying - information: Portions Copyright [yyyy] [name of copyright owner] - - CDDL HEADER END - - ident "%Z%%M% %I% %E% SMI" - - NOTE: This service profile is not editable; its contents will be - overwritten by package or patch operations, including operating - system upgrade. - - SunFire 15000 platform service profile. ---> -<service_bundle type='profile' name='default'> - <service name='system/cvc' version='1' type='service'> - <instance name='default' enabled='true'/> - </service> - <service name='platform/sun4u/dcs' version='1' type='service'> - <instance name='default' enabled='true'/> - </service> - <service name='platform/sun4u/efdaemon' version='1' type='service'> - <instance name='default' enabled='true'/> - </service> - <service name='platform/sun4u/sckmd' version='1' type='service'> - <instance name='default' enabled='true'/> - </service> -</service_bundle> |