Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix normal user with --rootless or --disable-agent have no permission to start

Browse Source 
Signed-off-by: JenTing Hsiao <jenting.hsiao@suse.com>
This commit is contained in:
JenTing Hsiao 2021-01-07 10:55:23 +08:00 committed by Brad Davidson
parent 6dabf7ac61
commit 3c7fd3d37b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/k3s/main.go
View File

@ -57,7 +57,11 @@ func findDataDir() string {
} }
dataDir := configfilearg.MustFindString(os.Args, "data-dir") dataDir := configfilearg.MustFindString(os.Args, "data-dir")
if dataDir == "" { if dataDir == "" {
dataDir = datadir.DefaultDataDir if os.Getuid() == 0 {
dataDir = datadir.DefaultDataDir
} else {
dataDir = datadir.DefaultHomeDataDir
}
logrus.Debug("Using default data dir in self-extracting wrapper") logrus.Debug("Using default data dir in self-extracting wrapper")
} }
return dataDir return dataDir