summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-01-13 23:29:05 +0000
committergVisor bot <gvisor-bot@google.com>2021-01-13 23:29:05 +0000
commitcfa5eea33e3e8a2f8e7cac622ab046df43ccf0a1 (patch)
tree1801022221a05d22341a0ad47f3754f2fc82cead
parent3a5e85451fda42163b60796f3914a3fa920025bf (diff)
parent1efe0ebc5973ec8a06b881c087dae2183898504b (diff)
Merge release-20201216.0-104-g1efe0ebc5 (automated)
-rw-r--r--runsc/config/flags.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/config/flags.go b/runsc/config/flags.go
index 02ab9255a..7e738dfdf 100644
--- a/runsc/config/flags.go
+++ b/runsc/config/flags.go
@@ -114,7 +114,7 @@ func NewFromFlags() (*Config, error) {
if len(conf.RootDir) == 0 {
// If not set, set default root dir to something (hopefully) user-writeable.
conf.RootDir = "/var/run/runsc"
- if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
+ if runtimeDir, ok := os.LookupEnv("XDG_RUNTIME_DIR"); ok {
conf.RootDir = filepath.Join(runtimeDir, "runsc")
}
}