Print this page
5834 Remove dependency on sysidtool
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/svc/milestone/single-user.xml
+++ new/usr/src/cmd/svc/milestone/single-user.xml
1 1 <?xml version="1.0"?>
2 2 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
3 3 <!--
4 4 Copyright 2005 Sun Microsystems, Inc. All rights reserved.
5 5 Use is subject to license terms.
6 + Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
6 7
7 8 CDDL HEADER START
8 9
9 10 The contents of this file are subject to the terms of the
10 11 Common Development and Distribution License, Version 1.0 only
11 12 (the "License"). You may not use this file except in compliance
12 13 with the License.
13 14
14 15 You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
15 16 or http://www.opensolaris.org/os/licensing.
16 17 See the License for the specific language governing permissions
17 18 and limitations under the License.
18 19
19 20 When distributing Covered Code, include this CDDL HEADER in each
20 21 file and include the License file at usr/src/OPENSOLARIS.LICENSE.
21 22 If applicable, add the following below this CDDL HEADER, with the
22 23 fields enclosed by brackets "[]" replaced with your own identifying
23 24 information: Portions Copyright [yyyy] [name of copyright owner]
24 25
25 26 CDDL HEADER END
26 27
27 28 ident "%Z%%M% %I% %E% SMI"
28 29
29 30 NOTE: This service manifest is not editable; its contents will
30 31 be overwritten by package or patch operations, including
31 32 operating system upgrade. Make customizations in a different
32 33 file.
33 34 -->
34 35
35 36 <service_bundle type='manifest' name='SUNWcsr:single-user'>
|
↓ open down ↓ |
20 lines elided |
↑ open up ↑ |
36 37
37 38 <service
38 39 name='milestone/single-user'
39 40 type='service'
40 41 version='1'>
41 42
42 43 <create_default_instance enabled='true' />
43 44
44 45 <single_instance />
45 46
46 - <!--
47 - Single-user's dependency on sysidtool is obsolete, but instead of
48 - removing it from this manifest, retain it here with its delete
49 - attribute set to true. This is to try and prevent a dependency
50 - cycle with the new sysidtool which declares a dependency on
51 - single-user. This will force the deletion of single-user's
52 - sysidtool dependency as soon as this manifest is imported
53 - (instead of waiting for upgrade to delete it).
54 -
55 - Note that this does not guarantee the prevention of a dependency
56 - cycle (if the new sysidtool manifest is imported before
57 - single-user's) - if this does occur, the code in upgrade will
58 - catch it - it deletes single-user's dependency and "svcadm
59 - clear"s sysidtool.
60 - -->
61 -
62 47 <dependency
63 - name='sysidtool'
64 - grouping='require_all'
65 - restart_on='none'
66 - type='service'
67 - delete='true'>
68 - <service_fmri value='svc:/system/sysidtool:net' />
69 - <service_fmri value='svc:/system/sysidtool:system' />
70 - </dependency>
71 -
72 - <dependency
73 48 name='nodename'
74 49 grouping='require_all'
75 50 restart_on='none'
76 51 type='service'>
77 52 <service_fmri value='svc:/system/identity:node' />
78 53 </dependency>
79 54
80 55 <dependency
81 56 name='filesystem-minimal'
82 57 grouping='require_all'
83 58 restart_on='none'
84 59 type='service'>
85 60 <service_fmri value='svc:/system/filesystem/minimal' />
86 61 </dependency>
87 62
88 63 <dependency
89 64 name='milestone-devices'
90 65 grouping='require_all'
91 66 restart_on='none'
92 67 type='service'>
93 68 <service_fmri value='svc:/milestone/devices' />
94 69 </dependency>
95 70
96 71 <dependency
97 72 name='manifests'
98 73 grouping='require_all'
99 74 restart_on='none'
100 75 type='service'>
101 76 <service_fmri value='svc:/system/manifest-import' />
102 77 </dependency>
103 78
104 79 <dependency
105 80 name='loopback-network'
106 81 grouping='require_any'
107 82 restart_on='none'
108 83 type='service'>
109 84 <service_fmri value='svc:/network/loopback' />
110 85 </dependency>
111 86
112 87 <dependency
113 88 name='network'
114 89 grouping='optional_all'
115 90 restart_on='none'
116 91 type='service'>
117 92 <service_fmri value='svc:/milestone/network' />
118 93 </dependency>
119 94
120 95 <!--
121 96 We can't know how long legacy init scripts will take to run. Set
122 97 the timeout value high enough to allow them to take their time
123 98 to start.
124 99 -->
125 100
126 101 <exec_method
127 102 type='method'
128 103 name='start'
129 104 exec='/sbin/rcS start'
130 105 timeout_seconds='1800' />
131 106
132 107 <exec_method
133 108 type='method'
134 109 name='stop'
135 110 exec=':true'
136 111 timeout_seconds='0' />
137 112
138 113 <!--
139 114 The init scripts should never automatically be run twice.
140 115 duration=transient tells svc.startd not to restart if no
141 116 processes are left running, and timeout_retry=false tells
142 117 svc.startd not to retry the start method if it times out.
143 118 -->
144 119 <property_group name='startd' type='framework'>
145 120 <propval name='duration' type='astring' value='transient' />
146 121 <propval name='timeout_retry' type='boolean' value='false' />
147 122 </property_group>
148 123
149 124 <stability value='Evolving' />
150 125
151 126 <template>
152 127 <common_name>
153 128 <loctext xml:lang='C'>
154 129 single-user milestone
155 130 </loctext>
156 131 </common_name>
157 132 <documentation>
158 133 <manpage title='init' section='1M'
159 134 manpath='/usr/share/man' />
160 135 </documentation>
161 136 </template>
162 137 </service>
163 138
164 139 </service_bundle>
|
↓ open down ↓ |
82 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX