From 91e5587fb073c599b37a84b64143f6d14d0db8bb Mon Sep 17 00:00:00 2001 From: richardxz Date: Thu, 21 Jun 2018 10:28:48 +0800 Subject: [PATCH] change default shell to "sh" instead of "bash", change default mysql user to "root" --- pkg/models/terminal.go | 2 +- pkg/options/options.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/models/terminal.go b/pkg/models/terminal.go index 95c0d1f99..3f565708a 100644 --- a/pkg/models/terminal.go +++ b/pkg/models/terminal.go @@ -271,7 +271,7 @@ func WaitForTerminal(k8sClient kubernetes.Interface, cfg *rest.Config, request * close(terminalSessions[sessionId].bound) var err error - validShells := []string{"bash", "sh"} + validShells := []string{"sh", "bash"} if isValidShell(validShells, shell) { cmd := []string{shell} diff --git a/pkg/options/options.go b/pkg/options/options.go index fde3ab611..8bcf68a7b 100644 --- a/pkg/options/options.go +++ b/pkg/options/options.go @@ -107,7 +107,7 @@ func (s *ServerRunOptions) addFlags(fs *pflag.FlagSet) { fs.StringVar(&s.mysqlPasswd, "mysql-password", "123456", "Password of mysql") - fs.StringVar(&s.mysqlUser, "mysql-user", "mysql", + fs.StringVar(&s.mysqlUser, "mysql-user", "root", "User of mysql.") fs.StringVar(&s.opAddress, "openpitrix-address", "http://openpitrix-api-gateway.openpitrix-system.svc",