Print this page
NEX-15896 net-routing-setup should not enable in.routed
Contributed by: Alexander Pyhalov <alp@rsu.ru>
Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Cynthia Eastham <cynthia.eastham@nexenta.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/svc/milestone/network-routing-setup.xml
+++ new/usr/src/cmd/svc/milestone/network-routing-setup.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 - Copyright 2006 Sun Microsystems, Inc. All rights reserved.
5 - Use is subject to license terms.
6 -
7 - CDDL HEADER START
8 -
9 4 The contents of this file are subject to the terms of the
10 5 Common Development and Distribution License (the "License").
11 6 You may not use this file except in compliance with the License.
12 7
13 8 You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
14 9 or http://www.opensolaris.org/os/licensing.
15 10 See the License for the specific language governing permissions
16 11 and limitations under the License.
17 12
18 13 When distributing Covered Code, include this CDDL HEADER in each
19 14 file and include the License file at usr/src/OPENSOLARIS.LICENSE.
20 15 If applicable, add the following below this CDDL HEADER, with the
21 16 fields enclosed by brackets "[]" replaced with your own identifying
22 17 information: Portions Copyright [yyyy] [name of copyright owner]
23 18
24 - CDDL HEADER END
19 + Copyright 2006 Sun Microsystems, Inc. All rights reserved.
20 + Use is subject to license terms.
21 + Copyright 2018 Nexenta Systems, Inc.
22 +-->
25 23
26 - ident "%Z%%M% %I% %E% SMI"
27 -
28 - NOTE: This service manifest is not editable; its contents will
29 - be overwritten by package or patch operations, including
30 - operating system upgrade. Make customizations in a different
31 - file.
24 +<!--
25 + NOTE: This service manifest is not editable; its contents will
26 + be overwritten by package or patch operations, including
27 + operating system upgrade. Make customizations in a different
28 + file.
32 29 -->
33 30
34 31 <service_bundle type='manifest' name='SUNWcsr:routing-setup'>
35 32
36 33 <service
37 34 name='network/routing-setup'
38 35 type='service'
39 36 version='1'>
40 37
41 38 <!-- loopback/physical network configuration is required -->
42 39 <dependency
43 40 name='network'
44 41 grouping='optional_all'
45 42 restart_on='none'
46 43 type='service'>
47 44 <service_fmri value='svc:/milestone/network' />
48 45 </dependency>
49 46
50 47 <!-- usr filesystem required to run routing-related commands -->
51 48 <dependency
52 49 name='filesystem'
53 50 grouping='require_all'
54 51 restart_on='none'
55 52 type='service'>
56 53 <service_fmri value='svc:/system/filesystem/usr' />
57 54 </dependency>
58 55
59 56 <!--
60 57 This dependency was added to make sure soconfig runs in
61 58 devices-local method, before routeadm invocation in
62 59 network/routing-setup. This is because routeadm commands
63 60 depend on sockets.
64 61 -->
65 62 <dependency
66 63 name='devices'
67 64 grouping='require_all'
68 65 restart_on='none'
69 66 type='service'>
70 67 <service_fmri value='svc:/milestone/devices' />
71 68 </dependency>
72 69
73 70 <!--
74 71 This dependency is required to ensure that all routing-related
75 72 manifests have been imported prior to running routeadm.
76 73 -->
77 74 <dependency
78 75 name='manifest_import'
79 76 grouping='optional_all'
80 77 restart_on='none'
81 78 type='service'>
82 79 <service_fmri value='svc:/system/manifest-import:default' />
83 80 </dependency>
84 81
85 82 <exec_method
86 83 type='method'
87 84 name='start'
88 85 exec='/lib/svc/method/net-routing-setup'
89 86 timeout_seconds='600'>
90 87 </exec_method>
91 88
92 89 <exec_method
93 90 type='method'
94 91 name='stop'
95 92 exec=':true'
96 93 timeout_seconds='3'>
97 94 </exec_method>
98 95
99 96 <property_group name='startd' type='framework'>
100 97 <propval name='duration' type='astring' value='transient' />
101 98 </property_group>
102 99
103 100 <instance name='default' enabled='true' >
104 101
105 102 <!-- Properties in this group are used by routeadm (1M) -->
106 103 <property_group name='routeadm' type='framework'>
107 104 <stability value='Evolving' />
108 105 <!-- set if routeadm -e/d ipv4-routing is explicitly invoked -->
109 106 <propval name='ipv4-routing-set' type='boolean'
110 107 value='false' />
111 108 <!-- set if routeadm -e/d ipv6-routing is explicitly invoked -->
112 109 <propval name='ipv6-routing-set' type='boolean'
|
↓ open down ↓ |
71 lines elided |
↑ open up ↑ |
113 110 value='false' />
114 111 <!-- set if legacy routing.conf configuration has been read -->
115 112 <propval name='routing-conf-read' type='boolean'
116 113 value='false' />
117 114 <!-- default for ipv4-routing to revert to via routeadm -r -->
118 115 <propval name='default-ipv4-routing' type='boolean'
119 116 value='false' />
120 117 <propval name='default-ipv6-routing' type='boolean'
121 118 value='false' />
122 119 <!-- routing-svcs values, current and default -->
123 - <propval name='routing-svcs' type='astring'
124 - value='route:default ripng:default' />
125 - <propval name='default-routing-svcs' type='astring'
126 - value='route:default ripng:default' />
120 + <propval name='routing-svcs' type='astring' value='' />
121 + <propval name='default-routing-svcs' type='astring' value='' />
127 122 <propval name='value_authorization' type='astring'
128 123 value='solaris.smf.value.routing' />
129 124 </property_group>
130 125
131 126 </instance>
132 127
133 128 <stability value='Unstable' />
134 129
135 130 <template>
136 131 <common_name>
137 132 <loctext xml:lang='C'>
138 133 Initial routing-related configuration.
139 134 </loctext>
140 135 </common_name>
141 136 <documentation>
142 137 <manpage title='routeadm' section='1M'
143 138 manpath='/usr/share/man' />
144 139 </documentation>
145 140 </template>
146 141 </service>
147 142
148 143 </service_bundle>
|
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX