netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty values for XDG_RUNTIME_DIR properly.

Browse Source 
Fixes #6849

PiperOrigin-RevId: 413322019
This commit is contained in:
Ian Lewis
2021-11-30 22:18:11 -08:00
committed by gVisor bot
parent a68a8e716b
commit 72e222cd66
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/config/flags.go
+2 -1
View File
@@ -126,7 +126,8 @@ 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, ok := os.LookupEnv("XDG_RUNTIME_DIR"); ok {
// NOTE: empty values for XDG_RUNTIME_DIR should be ignored.
if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
conf.RootDir = filepath.Join(runtimeDir, "runsc")
}
}