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

Merge pull request #2134 from devimc/topic/virtcontainers/rootlessVCStoreUUIDPath

Browse Source 
virtcontainers/store: make VCStoreUUIDPath rootless
This commit is contained in:
Peng Tao 2019-10-14 10:27:06 +08:00 committed by GitHub
commit a1cd0f8f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
virtcontainers/store/filesystem_backend.go
View File

@ -105,7 +105,14 @@ var RunVMStoragePath = func() string {
// VMUUIDStoragePath is the uuid directory. // VMUUIDStoragePath is the uuid directory.
// It will contain all uuid info used by guest vm. // It will contain all uuid info used by guest vm.
var VMUUIDStoragePath = filepath.Join("/var/lib", StoragePathSuffix, UUIDPathSuffix) var VMUUIDStoragePath = func() string {
path := filepath.Join("/var/lib", StoragePathSuffix, UUIDPathSuffix)
if rootless.IsRootless() {
return filepath.Join(rootless.GetRootlessDir(), path)
}
return path
}
func itemToFile(item Item) (string, error) { func itemToFile(item Item) (string, error) {
switch item { switch item {

2
virtcontainers/store/vc.go
View File

@ -271,7 +271,7 @@ func SandboxConfigurationItemPath(id string, item Item) (string, error) {
// VCStoreUUIDPath returns a virtcontainers runtime uuid URL. // VCStoreUUIDPath returns a virtcontainers runtime uuid URL.
func VCStoreUUIDPath() string { func VCStoreUUIDPath() string {
return filesystemScheme + "://" + filepath.Join(VCStorePrefix, VMUUIDStoragePath) return filesystemScheme + "://" + filepath.Join(VCStorePrefix, VMUUIDStoragePath())
} }
// SandboxRuntimeRoot returns a virtcontainers sandbox runtime root URL. // SandboxRuntimeRoot returns a virtcontainers sandbox runtime root URL.