ssss

375650b4 · Sun Bo 孙博 · b1593d77 · 375650b4 · 375650b4
Commit 375650b4 authored 2 years ago by Sun Bo 孙博
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

vm_mgr/module/core/user_manager.go vm_mgr/module/core/user_manager.go +8 -4

vm_mgr/module/security/security_env.go vm_mgr/module/security/security_env.go +1 -1

No files found.
--- a/vm_mgr/module/core/user_manager.go
+++ b/vm_mgr/module/core/user_manager.go
@@ -85,17 +85,21 @@ func (u *UsersManager) CreateNewUsers() error {

 func (u *UsersManager) generateNewUser(newUserId int) error {

-	const addUserFormat = "useradd -u %d %s"
+	const addUserFormat = "useradd -g root -u %d %s"

 	newUser := u.constructNewUser(newUserId)
 	addUserCommand := fmt.Sprintf(addUserFormat, newUserId, newUser.UserName)
-
+	deletUser := fmt.Sprintf("userdel %s", newUser.UserName)
 	createSuccess := false

 	// it may fail to create user in centos, so add retry until it success
 	for !createSuccess {
-		if errString, err := utils.RunCmd(addUserCommand); err != nil {
-			u.logger.Warnf("attemp to create user fail: [%+v], err: [%s] and begin to retry", newUser, errString)
+
+		if result, err := utils.RunCmd(deletUser); err != nil {
+			u.logger.Warnf("delete: [%+v], err: [%s] ", newUser, result)
+		}
+		if result, err := utils.RunCmd(addUserCommand); err != nil {
+			u.logger.Warnf("attemp to create user fail: [%+v], err: [%s] and begin to retry", newUser, result)
 			continue
 		}


--- a/vm_mgr/module/security/security_env.go
+++ b/vm_mgr/module/security/security_env.go
@@ -88,7 +88,7 @@ func (s *SecurityEnv) InitConfig() error {
 }

 func (s *SecurityEnv) setDMSDir() error {
-	return os.Mkdir(config.DMSDir, 0755)
+	return utils.CreateDir(config.DMSDir)
 }

 func (s *SecurityEnv) setTmpMod() error {