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