1 |
commit: a21d590f878bf63510aa5692dd5668a56fa9f2db |
2 |
Author: Daniel Cordero <gentoo.catalyst <AT> 0xdc <DOT> io> |
3 |
AuthorDate: Mon May 9 11:20:47 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 13 17:42:57 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a21d590f |
7 |
|
8 |
catalyst/stage4: improve log message |
9 |
|
10 |
When creating a user with no additional groups, don't print a misleading |
11 |
message saying the user will be created with an equals sign in the |
12 |
username. |
13 |
|
14 |
Signed-off-by: Daniel Cordero <gentoo.catalyst <AT> 0xdc.io> |
15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
16 |
|
17 |
catalyst/base/stagebase.py | 4 +++- |
18 |
1 file changed, 3 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
21 |
index d4875491..eb869c70 100644 |
22 |
--- a/catalyst/base/stagebase.py |
23 |
+++ b/catalyst/base/stagebase.py |
24 |
@@ -945,9 +945,11 @@ class StageBase(TargetBase, ClearBase, GenBase): |
25 |
log.debug("users: '=' separator not found on line " + x) |
26 |
log.debug("users: missing separator means no groups found") |
27 |
uacmd = ["useradd", "-R", self.settings['chroot_path'], "-m", x] |
28 |
+ msg_create_user = "Creating user: '%s'" % usr |
29 |
if grp != '': |
30 |
uacmd = ["useradd", "-R", self.settings['chroot_path'], "-m", "-G", grp, usr] |
31 |
- log.notice("Creating user: '%s'", f"{usr}={grp}") |
32 |
+ msg_create_user = "Creating user: '%s' in group(s): %s" % usr, grp |
33 |
+ log.notice(msg_create_user) |
34 |
cmd(uacmd, env=self.env) |
35 |
|
36 |
def ssh_public_keys(self): |