Print this page
OS-200 need a better mechanism for storing persistent zone_did
OS-511 make zonecfg device resource extensible, like the net resource
OS-224 add more zonecfg net properties
OS-216 store all net config info on zone
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/libzonecfg/dtd/zonecfg.dtd.1
+++ new/usr/src/lib/libzonecfg/dtd/zonecfg.dtd.1
1 1 <?xml version='1.0' encoding='UTF-8' ?>
2 2
3 3 <!--
4 4 CDDL HEADER START
5 5
6 6 The contents of this file are subject to the terms of the
7 7 Common Development and Distribution License (the "License").
8 8 You may not use this file except in compliance with the License.
9 9
10 10 You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
11 11 or http://www.opensolaris.org/os/licensing.
12 12 See the License for the specific language governing permissions
13 13 and limitations under the License.
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
14 14
15 15 When distributing Covered Code, include this CDDL HEADER in each
16 16 file and include the License file at usr/src/OPENSOLARIS.LICENSE.
17 17 If applicable, add the following below this CDDL HEADER, with the
18 18 fields enclosed by brackets "[]" replaced with your own identifying
19 19 information: Portions Copyright [yyyy] [name of copyright owner]
20 20
21 21 CDDL HEADER END
22 22
23 23 Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
24 + Copyright (c) 2011, Joyent Inc. All rights reserved.
24 25
25 26 -->
26 27
27 28 <!--Element Definitions-->
28 29
29 30 <!ELEMENT fsoption EMPTY>
30 31 <!ATTLIST fsoption name CDATA #REQUIRED>
31 32
32 33 <!ELEMENT filesystem (fsoption)* >
33 34
34 35 <!ATTLIST filesystem special CDATA #REQUIRED
35 36 raw CDATA ""
36 37 directory CDATA #REQUIRED
37 38 type CDATA #REQUIRED>
38 39
|
↓ open down ↓ |
5 lines elided |
↑ open up ↑ |
39 40 <!--
40 41 The "inherited-pkg-dir" element may no longer be specified in a
41 42 configuration, however we retain the definition to aid with migration
42 43 of existing configurations.
43 44 -->
44 45
45 46 <!ELEMENT inherited-pkg-dir EMPTY>
46 47
47 48 <!ATTLIST inherited-pkg-dir directory CDATA #REQUIRED>
48 49
49 -<!ELEMENT network EMPTY>
50 +<!ELEMENT net-attr EMPTY>
51 +<!ATTLIST net-attr name CDATA #REQUIRED
52 + value CDATA #REQUIRED>
50 53
54 +<!ELEMENT network (net-attr)*>
55 +
51 56 <!ATTLIST network address CDATA ""
52 57 allowed-address CDATA ""
53 58 defrouter CDATA ""
54 - physical CDATA #REQUIRED>
59 + global-nic CDATA ""
60 + mac-addr CDATA ""
61 + physical CDATA #REQUIRED
62 + vlan-id CDATA "">
55 63
56 -<!ELEMENT device EMPTY>
64 +<!ELEMENT device (net-attr)*>
57 65
58 66 <!ATTLIST device match CDATA #REQUIRED>
59 67
60 68 <!--
61 69 Historically, the deleted-device element denoted a used-to-be
62 70 device element. This was used to keep track of device elements
63 71 deleted or modified by the user, and to cleanse /dev of such
64 72 entries at next zone boot.
65 73
66 74 With the ability to now configure devices dynamically, this
67 75 requirement no longer exists, but this element MUST remain in
68 76 perpetuity, since it is possible that an upgraded zone could
69 77 carry a deleted-device element, and would therefore fail XML
70 78 validation if removed
71 79 -->
72 80 <!ELEMENT deleted-device EMPTY>
73 81
74 82 <!ATTLIST deleted-device match CDATA #REQUIRED>
75 83
76 84 <!ELEMENT rctl-value EMPTY>
77 85
78 86 <!ATTLIST rctl-value priv CDATA #REQUIRED
79 87 limit CDATA #REQUIRED
80 88 action CDATA #REQUIRED>
81 89
82 90 <!ELEMENT rctl (rctl-value)*>
83 91
84 92 <!ATTLIST rctl name CDATA #REQUIRED>
85 93
86 94 <!ELEMENT attr EMPTY>
87 95
88 96 <!ATTLIST attr name CDATA #REQUIRED
89 97 type (boolean | int | string | uint)
90 98 #REQUIRED
91 99 value CDATA #REQUIRED>
92 100
93 101 <!ELEMENT dataset EMPTY>
94 102
95 103 <!ATTLIST dataset name CDATA #REQUIRED>
96 104
97 105 <!ELEMENT package EMPTY>
98 106
99 107 <!ATTLIST package name CDATA #REQUIRED
100 108 version CDATA #REQUIRED>
101 109
102 110 <!ELEMENT obsoletes EMPTY>
103 111 <!ATTLIST obsoletes id CDATA #REQUIRED>
104 112
105 113 <!ELEMENT incompatible EMPTY>
106 114 <!ATTLIST incompatible id CDATA #REQUIRED>
107 115
108 116 <!ELEMENT patch (obsoletes | incompatible)* >
109 117
110 118 <!ATTLIST patch id CDATA #REQUIRED>
111 119
112 120 <!ELEMENT dev-perm EMPTY>
113 121
114 122 <!ATTLIST dev-perm name CDATA #REQUIRED
115 123 uid CDATA #REQUIRED
116 124 gid CDATA #REQUIRED
117 125 mode CDATA #REQUIRED
118 126 acl CDATA #REQUIRED>
119 127
120 128 <!--
121 129 The tmp_pool element is separate from the pset element so that
122 130 we can track the importance value at the pool level, where it
123 131 belongs, instead of at the pset level. Once we have msets this
124 132 will be important since tmp psets and tmp msets will share a common
125 133 pool-level importance.
126 134 -->
127 135 <!ELEMENT tmp_pool EMPTY>
128 136
129 137 <!ATTLIST tmp_pool importance CDATA #REQUIRED>
130 138
131 139 <!ELEMENT pset EMPTY>
132 140
133 141 <!ATTLIST pset ncpu_min CDATA #REQUIRED
134 142 ncpu_max CDATA #REQUIRED>
135 143
136 144 <!ELEMENT mcap EMPTY>
137 145
138 146 <!ATTLIST mcap physcap CDATA #REQUIRED>
139 147
140 148 <!ELEMENT admin EMPTY>
141 149
142 150 <!ATTLIST admin user CDATA #REQUIRED
143 151 auths CDATA #REQUIRED>
144 152
145 153 <!ELEMENT zone (filesystem | inherited-pkg-dir | network | device |
146 154 deleted-device | rctl | attr | dataset | package |
147 155 patch | dev-perm | tmp_pool | pset |
148 156 mcap | admin)*>
|
↓ open down ↓ |
82 lines elided |
↑ open up ↑ |
149 157
150 158 <!ATTLIST zone name CDATA #REQUIRED
151 159 zonepath CDATA #REQUIRED
152 160 autoboot (true | false) #REQUIRED
153 161 ip-type CDATA ""
154 162 hostid CDATA ""
155 163 pool CDATA ""
156 164 limitpriv CDATA ""
157 165 bootargs CDATA ""
158 166 brand CDATA ""
167 + debugid CDATA ""
159 168 scheduling-class CDATA ""
160 169 fs-allowed CDATA ""
161 170 version NMTOKEN #FIXED '1'>
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX