From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A9ED158090 for ; Fri, 13 May 2022 17:45:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F6ACE0894; Fri, 13 May 2022 17:45:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 378B8E0894 for ; Fri, 13 May 2022 17:45:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 634C2341167 for ; Fri, 13 May 2022 17:45:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15802465 for ; Fri, 13 May 2022 17:45:17 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1652463777.a21d590f878bf63510aa5692dd5668a56fa9f2db.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a21d590f878bf63510aa5692dd5668a56fa9f2db X-VCS-Branch: master Date: Fri, 13 May 2022 17:45:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 41996aaf-a10b-4b5d-bc4c-a71a0a1d314f X-Archives-Hash: cdcb89b254b3aa36e61afa6559af0615 commit: a21d590f878bf63510aa5692dd5668a56fa9f2db Author: Daniel Cordero 0xdc io> AuthorDate: Mon May 9 11:20:47 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 13 17:42:57 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a21d590f 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 0xdc.io> Signed-off-by: Matt Turner gentoo.org> 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): From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57B58158090 for ; Fri, 13 May 2022 17:43:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DDCFE0837; Fri, 13 May 2022 17:43:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82B29E0837 for ; Fri, 13 May 2022 17:43:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FEF1341A75 for ; Fri, 13 May 2022 17:43:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 200E1465 for ; Fri, 13 May 2022 17:43:46 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1652463777.a21d590f878bf63510aa5692dd5668a56fa9f2db.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:stage4-user-groups-fixes commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a21d590f878bf63510aa5692dd5668a56fa9f2db X-VCS-Branch: stage4-user-groups-fixes Date: Fri, 13 May 2022 17:43:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 130156de-44e3-4242-8d7c-3847c38bf8ed X-Archives-Hash: 5c307fd207f8b56d54bffbbae424c02f Message-ID: <20220513174346.r5Mhmf-zu-398sd5G9EAazIOByo2-peLUQwaisDK5uU@z> commit: a21d590f878bf63510aa5692dd5668a56fa9f2db Author: Daniel Cordero 0xdc io> AuthorDate: Mon May 9 11:20:47 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 13 17:42:57 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a21d590f 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 0xdc.io> Signed-off-by: Matt Turner gentoo.org> 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): From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17794158020 for ; Sun, 20 Nov 2022 00:21:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5033CE0A7D; Sun, 20 Nov 2022 00:21:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3941AE0A7D for ; Sun, 20 Nov 2022 00:21:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BF9734120C for ; Sun, 20 Nov 2022 00:21:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CACE4762 for ; Sun, 20 Nov 2022 00:21:26 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1652463777.a21d590f878bf63510aa5692dd5668a56fa9f2db.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a21d590f878bf63510aa5692dd5668a56fa9f2db X-VCS-Branch: wip/mattst88 Date: Sun, 20 Nov 2022 00:21:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d5afed1-b2e6-43f4-83c5-5daff4b42ea0 X-Archives-Hash: 348789cbfa74a36b450244fea0a77fc1 Message-ID: <20221120002126.r-TWquOKBwM2-t1SPGMxt8hNxeQKX0wCnJSMDSD2I7w@z> commit: a21d590f878bf63510aa5692dd5668a56fa9f2db Author: Daniel Cordero 0xdc io> AuthorDate: Mon May 9 11:20:47 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 13 17:42:57 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a21d590f 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 0xdc.io> Signed-off-by: Matt Turner gentoo.org> 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):