From 27372ee73baffc38f6caa486e632f516458b41d5 Mon Sep 17 00:00:00 2001 From: Alberto Planas Date: Thu, 25 Oct 2018 17:36:20 +0200 Subject: [PATCH] groupadd: user --root instead of -R or -Q In some places of the code gpasswd and usermod are used depending on the plataform. One use -Q and other use -R to indicate a different root parameter. This patch unify this, using --root parameter. Partially fix #43131 --- salt/modules/groupadd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/modules/groupadd.py b/salt/modules/groupadd.py index 333ba744c3f8..15dec6e89837 100644 --- a/salt/modules/groupadd.py +++ b/salt/modules/groupadd.py @@ -253,7 +253,7 @@ def adduser(name, username, root=None): else: cmd = ['gpasswd', '--add', username, name] if root is not None: - cmd.extend(('-Q', root)) + cmd.extend(('--root', root)) else: cmd = ['usermod', '-G', name, username] if root is not None: @@ -300,7 +300,7 @@ def deluser(name, username, root=None): else: cmd = ['gpasswd', '--del', username, name] if root is not None: - cmd.extend(('-R', root)) + cmd.extend(('--root', root)) retcode = __salt__['cmd.retcode'](cmd, python_shell=False) elif __grains__['kernel'] == 'OpenBSD': out = __salt__['cmd.run_stdout']('id -Gn {0}'.format(username), @@ -352,7 +352,7 @@ def members(name, members_list, root=None): else: cmd = ['gpasswd', '--members', members_list, name] if root is not None: - cmd.extend(('-R', root)) + cmd.extend(('--root', root)) retcode = __salt__['cmd.retcode'](cmd, python_shell=False) elif __grains__['kernel'] == 'OpenBSD': retcode = 1