From a21d590f878bf63510aa5692dd5668a56fa9f2db Mon Sep 17 00:00:00 2001 From: Daniel Cordero Date: Mon, 9 May 2022 11:20:47 +0000 Subject: catalyst/stage4: improve log message When creating a user with no additional groups, don't print a misleading message saying the user will be created with an equals sign in the username. Signed-off-by: Daniel Cordero Signed-off-by: Matt Turner --- catalyst/base/stagebase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index d4875491..eb869c70 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -945,9 +945,11 @@ class StageBase(TargetBase, ClearBase, GenBase): log.debug("users: '=' separator not found on line " + x) log.debug("users: missing separator means no groups found") uacmd = ["useradd", "-R", self.settings['chroot_path'], "-m", x] + msg_create_user = "Creating user: '%s'" % usr if grp != '': uacmd = ["useradd", "-R", self.settings['chroot_path'], "-m", "-G", grp, usr] - log.notice("Creating user: '%s'", f"{usr}={grp}") + msg_create_user = "Creating user: '%s' in group(s): %s" % usr, grp + log.notice(msg_create_user) cmd(uacmd, env=self.env) def ssh_public_keys(self): -- cgit v1.2.3-65-gdbad