Skip to content

Commit d990cfe

Browse files
author
James O. D. Hunt
committed
Clarify path details for VM-based runtime configuration.
All paths specified in the configuration for virtual-machine-based runtimes are host-side. Signed-off-by: James O. D. Hunt <[email protected]>
1 parent da05912 commit d990cfe

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

config-vm.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ Virtual-machine-based runtimes require additional configuration to that specifie
44

55
This optional configuration is specified in a "VM" object:
66

7-
* **`imagePath`** (string, required) path to file that represents the root filesystem for the virtual machine.
7+
* **`imagePath`** (string, required) host path to file that represents the root filesystem for the virtual machine.
88
* **`kernel`** (object, required) specifies details of the kernel to boot the virtual machine with.
99

1010
Note that `imagePath` refers to a path on the host (outside of the virtual machine).
1111
This field is distinct from the **`path`** field in the [Root Configuration](config.md#Root-Configuration) section since in the context of a virtual-machine-based runtime:
1212

13-
* **`imagePath`** will represent the root filesystem for the virtual machine.
13+
* **`imagePath`** will represent the host path to the root filesystem for the virtual machine.
1414
* The container root filesystem specified by **`path`** from the [Root Configuration](config.md#Root-Configuration) section will be mounted inside the virtual machine at a location chosen by the virtual-machine-based runtime.
1515

1616
The virtual-machine-based runtime will use these two path fields to arrange for the **`path`** from the [Root Configuration](config.md#Root-Configuration) section to be presented to the process to run as the root filesystem.
@@ -19,9 +19,9 @@ The virtual-machine-based runtime will use these two path fields to arrange for
1919

2020
Used by virtual-machine-based runtimes only.
2121

22-
* **`path`** (string, required) specifies the path to the kernel used to boot the virtual machine.
22+
* **`path`** (string, required) specifies the host path to the kernel used to boot the virtual machine.
2323
* **`parameters`** (string, optional) specifies a space-separated list of parameters to pass to the kernel.
24-
* **`initrd`** (string, optional) specifies the path to an initial ramdisk to be used by the virtual machine.
24+
* **`initrd`** (string, optional) specifies the host path to an initial ramdisk to be used by the virtual machine.
2525

2626
## Example of a fully-populated `VM` object
2727

schema/schema-vm.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"properties": {
1111
"imagePath": {
12-
"description": "path to rootfs image on host system which is used for VM-based runtimes",
12+
"description": "host path to rootfs image on host system which is used for VM-based runtimes",
1313
"id": "https://opencontainers.org/schema/bundle/vm/imagePath",
1414
"type": "string"
1515
},
@@ -23,7 +23,7 @@
2323
"properties": {
2424
"path": {
2525
"id": "https://opencontainers.org/schema/bundle/vm/kernel/path",
26-
"description": "path to kernel image",
26+
"description": "host path to kernel image",
2727
"type": "string"
2828
},
2929
"parameters": {
@@ -32,7 +32,7 @@
3232
"type": "string"
3333
},
3434
"initrd": {
35-
"description": "path to initial ramdisk image",
35+
"description": "host path to initial ramdisk image",
3636
"id": "https://opencontainers.org/schema/bundle/vm/kernel/initrd",
3737
"type": "string"
3838
}

specs-go/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ type Spec struct {
3333
type VM struct {
3434
// Kernel specifies kernel-related configuration for virtual-machine-based runtimes.
3535
Kernel Kernel `json:"kernel"`
36-
// ImagePath is the path to the root filesystem image on the host which can be used by a virtual-machine-based runtime.
36+
// ImagePath is the host path to the root filesystem image on the host which can be used by a virtual-machine-based runtime.
3737
ImagePath string `json:"imagePath"`
3838
}
3939

4040
// Kernel contains information about the kernel to use for a virtual machine.
4141
type Kernel struct {
42-
// Path is the path to the kernel used to boot the virtual machine.
42+
// Path is the host path to the kernel used to boot the virtual machine.
4343
Path string `json:"path"`
4444
// Parameters specifies parameters to pass to the kernel.
4545
Parameters string `json:"parameters,omitempty"`
46-
// InitRd is the path to an initial ramdisk to be used by the kernel.
46+
// InitRd is the host path to an initial ramdisk to be used by the kernel.
4747
InitRd string `json:"initrd,omitempty"`
4848
}
4949

0 commit comments

Comments
 (0)