Skip to content

Commit

Permalink
Issue #743 make setup steps skippable due to incorrect Administrator …
Browse files Browse the repository at this point in the history
…role check

This is a workaround for issue #742. The current codebase performs the
wrong check for Administrator; a Domain User with the Administrator
role is wrongly identified as being the local Administrator.
  • Loading branch information
gbraad authored and cfergeau committed Oct 25, 2019
1 parent ae34d0f commit 8edb4c2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pkg/crc/preflight/preflight_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ func StartPreflightChecks(vmDriver string) {

// SetupHost performs the prerequisite checks and setups the host to run the cluster
func SetupHost(vmDriver string) {
preflightCheckAndFix(false,
preflightCheckAndFix(config.GetBool(cmdConfig.SkipCheckRootUser.Name),
checkIfRunningAsNormalUser,
fixRunAsNormalUser,
"Checking if running as non-root",
false,
config.GetBool(cmdConfig.WarnCheckRootUser.Name),
)
preflightCheckAndFix(false,
checkOcBinaryCached,
Expand Down
4 changes: 2 additions & 2 deletions pkg/crc/preflight/preflight_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ func StartPreflightChecks(vmDriver string) {

// SetupHost performs the prerequisite checks and setups the host to run the cluster
func SetupHost(vmDriver string) {
preflightCheckAndFix(false,
preflightCheckAndFix(config.GetBool(cmdConfig.SkipCheckRootUser.Name),
checkIfRunningAsNormalUser,
fixRunAsNormalUser,
"Checking if running as non-root",
false,
config.GetBool(cmdConfig.WarnCheckRootUser.Name),
)
preflightCheckAndFix(false,
checkOcBinaryCached,
Expand Down
4 changes: 2 additions & 2 deletions pkg/crc/preflight/preflight_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ func StartPreflightChecks(vmDriver string) {

// SetupHost performs the prerequisite checks and setups the host to run the cluster
func SetupHost(vmDriver string) {
preflightCheckAndFix(false,
preflightCheckAndFix(config.GetBool(cmdConfig.SkipCheckAdministratorUser.Name),
checkIfRunningAsNormalUserInWindows,
fixRunAsNormalUserInWindows,
"Checking if running as normal user",
false,
config.GetBool(cmdConfig.WarnCheckAdministratorUser.Name),
)
preflightCheckAndFix(false,
checkOcBinaryCached,
Expand Down

0 comments on commit 8edb4c2

Please sign in to comment.