From 8b8008569fd6a9c2ec4603dedbe27cbd000bdb36 Mon Sep 17 00:00:00 2001 From: Jonathan Mainguy Date: Mon, 17 Nov 2014 10:31:54 -0500 Subject: [PATCH] fixes user module for rhel5 by using -n instead of -N, all other distros will still use -N --- system/user.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/system/user.py b/system/user.py index 551384a7a67..6fe20122e91 100644 --- a/system/user.py +++ b/system/user.py @@ -299,7 +299,15 @@ class User(object): # exists with the same name as the user to prevent # errors from useradd trying to create a group when # USERGROUPS_ENAB is set in /etc/login.defs. - cmd.append('-N') + if os.path.exists('/etc/redhat-release'): + dist = platform.dist() + major_release = int(dist[1].split('.')[0]) + if major_release <= 5: + cmd.append('-n') + else: + cmd.append('-N') + else: + cmd.append('-N') if self.groups is not None and len(self.groups): groups = self.get_groups_set()