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 CB7F4158090 for ; Mon, 9 May 2022 11:21:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4C0EE08AD; Mon, 9 May 2022 11:21:25 +0000 (UTC) Received: from rs234.mailgun.us (rs234.mailgun.us [209.61.151.234]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id B6F28E08AD for ; Mon, 9 May 2022 11:21:25 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=0xdc.io; q=dns/txt; s=smtp; t=1652095285; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-Id: Date: Subject: Subject: To: To: From: From: Sender: Sender; bh=2ub3sEPuAZ48zrIQCXrgUuG/vFJDjzZBumtlL737gh4=; b=kGIazq+s9KDlCE5BMuFMMBZohDnAvTEM7mui0j9zgyFmtu9C7WY7ekEP38dUeEfun+hz70/R g2Uuev78jsg50ERvwCVt2X6elpgj7cyRyBPiq0tqcQnKRD9Yyw9BVk9ZPEjDWCBxpe90fw5s JjXt2bJBLP+fUoEQHceGt8Yw8b4= X-Mailgun-Sending-Ip: 209.61.151.234 X-Mailgun-Sid: WyJiZmIxMyIsICJnZW50b28tY2F0YWx5c3RAbGlzdHMuZ2VudG9vLm9yZyIsICJmNjc0NGUiXQ== Received: from mail.0xdc.io (mail.0xdc.io [54.37.0.172]) by smtp-out-n01.prod.us-west-2.postgun.com with SMTP id 6278f93467a97392c62975a1 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Mon, 09 May 2022 11:21:24 GMT Sender: gentoo.catalyst@0xdc.io Received: from pulsar (6.d.2.e.0.0.0.0.0.0.0.0.0.0.0.0.0.a.4.7.9.0.c.0.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:c09:74a0::e2d6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.0xdc.io (Postfix) with ESMTPSA id A955E1023A9 for ; Mon, 9 May 2022 11:23:17 +0000 (UTC) From: Daniel Cordero To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH v2 4/4] stage4/users: improve log message Date: Mon, 9 May 2022 11:20:47 +0000 Message-Id: <20220509112047.2422391-1-gentoo.catalyst@0xdc.io> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220421070826.92638-4-gentoo.catalyst@0xdc.io> References: <20220421070826.92638-4-gentoo.catalyst@0xdc.io> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 4db84071-2633-4509-ad09-bd21ab782aef X-Archives-Hash: 9cfd7c58e13ec812b45a023dd0f9064d 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. --- 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): -- 2.35.1