github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 16:57:18 +00:00
Code Issues Projects Releases Wiki Activity

kata_agent: use virtio-fs 0.3+ mount options

Browse Source 
virtio-fs changed the mount command-line.  Previously "mount none -o
tag=kataShared ..." was used.  Now "mount kataShared ..." is used
instead.

Since the "kataShared" tag is used for both 9P and virtio-fs, rename the
variable so that it is not 9P-specific.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Fixes: #1993
This commit is contained in:
Stefan Hajnoczi 2019-08-16 10:47:12 +01:00
parent 93197ddcc3
commit 6ce6a262a8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtcontainers/kata_agent.go
View File

@ -59,7 +59,7 @@ var (
errorMissingOCISpec = errors.New("Missing OCI specification") errorMissingOCISpec = errors.New("Missing OCI specification")
defaultKataHostSharedDir = "/run/kata-containers/shared/sandboxes/" defaultKataHostSharedDir = "/run/kata-containers/shared/sandboxes/"
defaultKataGuestSharedDir = "/run/kata-containers/shared/containers/" defaultKataGuestSharedDir = "/run/kata-containers/shared/containers/"
mountGuest9pTag = "kataShared" mountGuestTag = "kataShared"
defaultKataGuestSandboxDir = "/run/kata-containers/sandbox/" defaultKataGuestSandboxDir = "/run/kata-containers/sandbox/"
type9pFs = "9p" type9pFs = "9p"
typeVirtioFS = "virtio_fs" typeVirtioFS = "virtio_fs"
@ -72,7 +72,7 @@ var (
kataNvdimmDevType = "nvdimm" kataNvdimmDevType = "nvdimm"
kataVirtioFSDevType = "virtio-fs" kataVirtioFSDevType = "virtio-fs"
sharedDir9pOptions = []string{"trans=virtio,version=9p2000.L,cache=mmap", "nodev"} sharedDir9pOptions = []string{"trans=virtio,version=9p2000.L,cache=mmap", "nodev"}
sharedDirVirtioFSOptions = []string{"default_permissions,allow_other,rootmode=040000,user_id=0,group_id=0,dax,tag=" + mountGuest9pTag, "nodev"} sharedDirVirtioFSOptions = []string{"default_permissions,allow_other,rootmode=040000,user_id=0,group_id=0", "nodev"}
sharedDirVirtioFSDaxOptions = "dax" sharedDirVirtioFSDaxOptions = "dax"
shmDir = "shm" shmDir = "shm"
kataEphemeralDevType = "ephemeral" kataEphemeralDevType = "ephemeral"
@ -401,7 +401,7 @@ func (k *kataAgent) configure(h hypervisor, id, sharePath string, builtin bool,
// Create shared directory and add the shared volume if filesystem sharing is supported. // Create shared directory and add the shared volume if filesystem sharing is supported.
// This volume contains all bind mounted container bundles. // This volume contains all bind mounted container bundles.
sharedVolume := types.Volume{ sharedVolume := types.Volume{
MountTag: mountGuest9pTag, MountTag: mountGuestTag,
HostPath: sharePath, HostPath: sharePath,
} }
@ -872,7 +872,7 @@ func setupStorages(sandbox *Sandbox) []*grpc.Storage {
} }
sharedVolume := &grpc.Storage{ sharedVolume := &grpc.Storage{
Driver: kataVirtioFSDevType, Driver: kataVirtioFSDevType,
Source: "none", Source: mountGuestTag,
MountPoint: kataGuestSharedDir(), MountPoint: kataGuestSharedDir(),
Fstype: typeVirtioFS, Fstype: typeVirtioFS,
Options: sharedDirVirtioFSOptions, Options: sharedDirVirtioFSOptions,
@ -884,7 +884,7 @@ func setupStorages(sandbox *Sandbox) []*grpc.Storage {
sharedVolume := &grpc.Storage{ sharedVolume := &grpc.Storage{
Driver: kata9pDevType, Driver: kata9pDevType,
Source: mountGuest9pTag, Source: mountGuestTag,
MountPoint: kataGuestSharedDir(), MountPoint: kataGuestSharedDir(),
Fstype: type9pFs, Fstype: type9pFs,
Options: sharedDir9pOptions, Options: sharedDir9pOptions,