From 44a8ac7b0c6cf7f7c0e381e3e308beb22e1ce358 Mon Sep 17 00:00:00 2001
From: Eric Lin <exlin@google.com>
Date: Sat, 12 Mar 2022 11:49:29 +0000
Subject: [PATCH] Turn paths from cmdline into absolute paths

Snapshotter service returning relative paths confuses the client (i.e.
ctr).

Closes: #6671

Signed-off-by: Eric Lin <linxiulei@gmail.com>
---
 cmd/containerd/command/main.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
index f549e08a3..cac1c4b71 100644
--- a/cmd/containerd/command/main.go
+++ b/cmd/containerd/command/main.go
@@ -323,6 +323,13 @@ func applyFlags(context *cli.Context, config *srvconfig.Config) error {
 	} {
 		if s := context.GlobalString(v.name); s != "" {
 			*v.d = s
+			if v.name == "root" || v.name == "state" {
+				absPath, err := filepath.Abs(s)
+				if err != nil {
+					return err
+				}
+				*v.d = absPath
+			}
 		}
 	}