diff --git a/pym/install/variables/system.py b/pym/install/variables/system.py index 44bba77..a6fab17 100644 --- a/pym/install/variables/system.py +++ b/pym/install/variables/system.py @@ -396,9 +396,9 @@ class VariableClMigrateUserGroups(UserHelper, Variable): Migrate users groups """ type = 'choice-list-list' - defaultGroupList = ["users", "wheel", "audio", "cdrom", "video", + defaultGroupList = sorted(["users", "wheel", "audio", "cdrom", "video", "cdrw", "usb", "plugdev", "games", "lp", "scanner", - "uucp"] + "uucp"]) def getDefaultGroups(self): return list(set(self.defaultGroupList) & set(getGroups())) @@ -423,7 +423,7 @@ class VariableClMigrateUserGroups(UserHelper, Variable): User groups """ passwdList = getPasswdUsers() - return map(lambda x: (self.getPrimaryGroup(x) + + return map(lambda x: sorted(self.getPrimaryGroup(x) + (getUserGroups(x) if x in passwdList else self.getDefaultGroups())), @@ -433,7 +433,7 @@ class VariableClMigrateUserGroups(UserHelper, Variable): """ Available groups """ - return [("", _("Default"))] + [(x, x) for x in getGroups()] + return [("", _("Default"))] + sorted([(x, x) for x in getGroups()]) class VariableClMigrateUserPwd(UserHelper, Variable):