aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-08 00:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1412 from lifupan/shimv2mount

Browse Source 
shimv2: optionally plug rootfs block storage instead of mounting it
This commit is contained in:
Peng Tao
2019-04-02 15:30:40 +08:00
committed by GitHub
parent 12437c2ded 52c66d20dc
commit 25d21060e3
19 changed files with 322 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/create.go
View File

@@ -127,15 +127,18 @@ func create(ctx context.Context, containerID, bundlePath, console, pidFilePath s
disableOutput := noNeedForOutput(detach, ociSpec.Process.Terminal)
//rootfs has been mounted by containerd shim
rootFs := vc.RootFs{Mounted: true}
var process vc.Process
switch containerType {
case vc.PodSandbox:
_, process, err = katautils.CreateSandbox(ctx, vci, ociSpec, runtimeConfig, containerID, bundlePath, console, disableOutput, systemdCgroup, false)
_, process, err = katautils.CreateSandbox(ctx, vci, ociSpec, runtimeConfig, rootFs, containerID, bundlePath, console, disableOutput, systemdCgroup, false)
if err != nil {
return err
}
case vc.PodContainer:
process, err = katautils.CreateContainer(ctx, vci, nil, ociSpec, containerID, bundlePath, console, disableOutput, false)
process, err = katautils.CreateContainer(ctx, vci, nil, ociSpec, rootFs, containerID, bundlePath, console, disableOutput, false)
if err != nil {
return err
}