Merge pull request #220 from rancher-sandbox/fallback-user

AkihiroSuda · web-flow · commit a1a6c05b2e9a · 2021-09-08T13:08:40.000+09:00
Only fallback to "lima" user when host user is invalid
diff --git a/pkg/osutil/user.go b/pkg/osutil/user.go
@@ -27,8 +27,8 @@ func LimaUser(warn bool) (*user.User, error) {
 			if err := identifiers.Validate(cache.u.Username); err != nil {
 				cache.warning = fmt.Sprintf("local user %q is not a valid Linux username: %v; using %q username instead",
 					cache.u.Username, err, fallbackUser)
+				cache.u.Username = fallbackUser
 			}
-			cache.u.Username = fallbackUser
 		}
 	})
 	if warn && cache.warning != "" {

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ func LimaUser(warn bool) (*user.User, error) {`
`27`	`27`	`if err := identifiers.Validate(cache.u.Username); err != nil {`
`28`	`28`	`cache.warning = fmt.Sprintf("local user %q is not a valid Linux username: %v; using %q username instead",`
`29`	`29`	`cache.u.Username, err, fallbackUser)`
	`30`	`+ cache.u.Username = fallbackUser`
`30`	`31`	`}`
`31`		`- cache.u.Username = fallbackUser`
`32`	`32`	`}`
`33`	`33`	`})`
`34`	`34`	`if warn && cache.warning != "" {`