Merge pull request #2309 from amshinde/my-stable-1.9

virtcontainers/store: make VCStoreUUIDPath rootless
kata-containers · Dec 4, 2019 · 2414edd · 2414edd
2 parents 6827cc3 + 9204973
commit 2414edd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/virtcontainers/store/filesystem_backend.go b/virtcontainers/store/filesystem_backend.go
@@ -105,7 +105,14 @@ var RunVMStoragePath = func() string {
 
 // VMUUIDStoragePath is the uuid directory.
 // 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) {
 	switch item {

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