Ubuntu's passwd command doesn't support --stdin option, use chpasswd …

…which is also available in CentOS
yaoml · Jan 7, 2016 · 73522dc · 73522dc
1 parent d9b4f55
commit 73522dc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/juser/user_api.py b/juser/user_api.py
@@ -151,8 +151,8 @@ def server_add_user(username, password, ssh_key_pwd='', ssh_key_login_need=True)
     add a system user in jumpserver
     在jumpserver服务器上添加一个用户
     """
-    bash("useradd -s %s/connect.py '%s'; echo '%s'; echo '%s' | passwd --stdin '%s'" % 
-         (BASE_DIR, username, password, password, username))
+    bash("useradd -s %s/connect.py '%s'; echo '%s'; echo '%s:%s' | chpasswd " %
+         (BASE_DIR, username, password, username, password))
     if ssh_key_login_need:
         gen_ssh_key(username, ssh_key_pwd)