Skip to content

Commit d974e9d

Browse files
authored
Merge pull request #793 from wking/unique-solaris-zonecfg-link-target
config-solaris: Restore 'zonecfg.1m_2' link targets
2 parents 8202372 + 27c045a commit d974e9d

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

config-solaris.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# <a name="solarisApplicationContainerConfiguration" />Solaris Application Container Configuration
22

3-
Solaris application containers can be configured using the following properties, all of the below properties have mappings to properties specified under [zonecfg(1M)][zonecfg.1m] man page, except milestone.
3+
Solaris application containers can be configured using the following properties, all of the below properties have mappings to properties specified under [zonecfg(1M)][zonecfg.1m_2] man page, except milestone.
44

55
## <a name="configSolarisMilestone" />milestone
66
The SMF(Service Management Facility) FMRI which should go to "online" state before we start the desired process within the container.
@@ -26,7 +26,7 @@ The property should consist of a comma-separated privilege set specification as
2626
## <a name="configSolarisMaxShmMemory" />maxShmMemory
2727
The maximum amount of shared memory allowed for this application container.
2828
A scale (K, M, G, T) can be applied to the value for each of these numbers (for example, 1M is one megabyte).
29-
Mapped to `max-shm-memory` in [zonecfg(1M)][zonecfg.1m] man page.
29+
Mapped to `max-shm-memory` in [zonecfg(1M)][zonecfg.1m_2] man page.
3030

3131
**`maxShmMemory`** *(string, OPTIONAL)*
3232

@@ -40,7 +40,7 @@ Sets a limit on the amount of CPU time that can be used by a container.
4040
The unit used translates to the percentage of a single CPU that can be used by all user threads in a container, expressed as a fraction (for example, .75) or a mixed number (whole number and fraction, for example, 1.25).
4141
An ncpu value of 1 means 100% of a CPU, a value of 1.25 means 125%, .75 mean 75%, and so forth.
4242
When projects within a capped container have their own caps, the minimum value takes precedence.
43-
cappedCPU is mapped to `capped-cpu` in [zonecfg(1M)][zonecfg.1m] man page.
43+
cappedCPU is mapped to `capped-cpu` in [zonecfg(1M)][zonecfg.1m_2] man page.
4444

4545
* **`ncpus`** *(string, OPTIONAL)*
4646

@@ -54,7 +54,7 @@ cappedCPU is mapped to `capped-cpu` in [zonecfg(1M)][zonecfg.1m] man page.
5454
## <a name="configSolarisCappedMemory" />cappedMemory
5555
The physical and swap caps on the memory that can be used by this application container.
5656
A scale (K, M, G, T) can be applied to the value for each of these numbers (for example, 1M is one megabyte).
57-
cappedMemory is mapped to `capped-memory` in [zonecfg(1M)][zonecfg.1m] man page.
57+
cappedMemory is mapped to `capped-memory` in [zonecfg(1M)][zonecfg.1m_2] man page.
5858

5959
* **`physical`** *(string, OPTIONAL)*
6060
* **`swap`** *(string, OPTIONAL)*
@@ -78,26 +78,26 @@ For more information on the daemon see the [zoneadmd(1M)][zoneadmd.1m] man page.
7878
When such a container is started, a temporary VNIC(Virtual NIC) is automatically created for the container.
7979
The VNIC is deleted when the container is torn down.
8080
The following properties can be used to setup automatic networks.
81-
For additional information on properties, check the [zonecfg(1M)][zonecfg.1m] man page for the respective release of Solaris.
81+
For additional information on properties, check the [zonecfg(1M)][zonecfg.1m_2] man page for the respective release of Solaris.
8282

8383
* **`linkname`** *(string, OPTIONAL)* Specify a name for the automatically created VNIC datalink.
8484
* **`lowerLink`** *(string, OPTIONAL)* Specify the link over which the VNIC will be created.
85-
Mapped to `lower-link` in the [zonecfg(1M)][zonecfg.1m] man page.
85+
Mapped to `lower-link` in the [zonecfg(1M)][zonecfg.1m_2] man page.
8686
* **`allowedAddress`** *(string, OPTIONAL)* The set of IP addresses that the container can use might be constrained by specifying the allowedAddress property.
8787
If allowedAddress has not been specified, then they can use any IP address on the associated physical interface for the network resource.
8888
Otherwise, when allowedAddress is specified, the container cannot use IP addresses that are not in the allowedAddress list for the physical address.
89-
Mapped to `allowed-address` in the [zonecfg(1M)][zonecfg.1m] man page.
89+
Mapped to `allowed-address` in the [zonecfg(1M)][zonecfg.1m_2] man page.
9090
* **`configureAllowedAddress`** *(string, OPTIONAL)* If configureAllowedAddress is set to true, the addresses specified by allowedAddress are automatically configured on the interface each time the container starts.
9191
When it is set to false, the allowedAddress will not be configured on container start.
92-
Mapped to `configure-allowed-address` in the [zonecfg(1M)][zonecfg.1m] man page.
92+
Mapped to `configure-allowed-address` in the [zonecfg(1M)][zonecfg.1m_2] man page.
9393
* **`defrouter`** *(string, OPTIONAL)* The value for the OPTIONAL default router.
9494
* **`macAddress`** *(string, OPTIONAL)* Set the VNIC's MAC addresses based on the specified value or keyword.
9595
If not a keyword, it is interpreted as a unicast MAC address.
96-
For a list of the supported keywords please refer to the [zonecfg(1M)][zonecfg.1m] man page of the respective Solaris release.
97-
Mapped to `mac-address` in the [zonecfg(1M)][zonecfg.1m] man page.
96+
For a list of the supported keywords please refer to the [zonecfg(1M)][zonecfg.1m_2] man page of the respective Solaris release.
97+
Mapped to `mac-address` in the [zonecfg(1M)][zonecfg.1m_2] man page.
9898
* **`linkProtection`** *(string, OPTIONAL)* Enables one or more types of link protection using comma-separated values.
9999
See the protection property in dladm(8) for supported values in respective release of Solaris.
100-
Mapped to `link-protection` in the [zonecfg(1M)][zonecfg.1m] man page.
100+
Mapped to `link-protection` in the [zonecfg(1M)][zonecfg.1m_2] man page.
101101

102102
#### Example
103103
```json
@@ -117,4 +117,4 @@ Mapped to `link-protection` in the [zonecfg(1M)][zonecfg.1m] man page.
117117

118118
[priv-str-to-set.3c]: http://docs.oracle.com/cd/E53394_01/html/E54766/priv-str-to-set-3c.html
119119
[zoneadmd.1m]: http://docs.oracle.com/cd/E53394_01/html/E54764/zoneadmd-1m.html
120-
[zonecfg.1m]: https://docs.oracle.com/cd/E36784_01/html/E36871/zonecfg-1m.html
120+
[zonecfg.1m_2]: https://docs.oracle.com/cd/E36784_01/html/E36871/zonecfg-1m.html

0 commit comments

Comments
 (0)