From patchwork Thu Aug 25 16:30:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 11876 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 402D0ECAA25 for ; Thu, 25 Aug 2022 16:30:50 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by mx.groups.io with SMTP id smtpd.web12.26017.1661445049656633342 for ; Thu, 25 Aug 2022 09:30:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gherzan.com header.s=fm2 header.b=TyAp7ebc; spf=pass (domain: gherzan.com, ip: 66.111.4.28, mailfrom: andrei@gherzan.com) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id EBC175C009A; Thu, 25 Aug 2022 12:30:48 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 25 Aug 2022 12:30:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1661445048; x=1661531448; bh=U1 mFO9uXr60avOZR+syTCOQw4wOoQNpu1zpSi6WMY4M=; b=TyAp7ebcDRveoP2s9U q5tHuB3OXHf55/QTNJcKW6jY+/zWI7ZGsuXFBwRPWOVesqOgBprNcDNhGV/aBwpI D01Gv0LudLITBKGebJu0vreggCerUChzF3dBRI2HNIpBUlSuhIptn+TqXDrOSux3 CbV6r7McW0V1SNU/ZUeTZHlvkd7DNlcZXWWiewlWdRw5/MmS1KLDW21/XMN0L7j9 TDjaxkcBSFJtpasbrDT7wAb9oMzrj0F23e1UqwuuQvy5OrYdq3heWoFAKM1oyRcz XkdB8QYHMA6vckoYpJhhNXXBxS7sGLg3WlpT5A7RdXMPx1836Mpj5xRNhzm387Vg zMjQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1661445048; x=1661531448; bh=U1mFO9uXr60av OZR+syTCOQw4wOoQNpu1zpSi6WMY4M=; b=uW9yJVzdpR8vqUpJFAv9kHBGy9WIh 3WKlze2UVzQgQ/a1n2olcJKTM4Ms3dbG3v4TImiyhGVAksAKIqsJlbkAq4fLfsRp zR5Efnr2Hb85Wu7j/4wJOMAJ1/79qVw+gp2j+EcgJ0nWv+rO+ROEFi9TkoRg0QaM p6MFk+H6Y4Yu4/7ANcANmuTjw9BJ2lfM1l2OSpGWpRjbjXMItmi3iJgaDnMYXqoM HYeSA2BxNncOl7d2ewwNv5fQ6x7ps1lpJxHMPPapvrETGk7nR7a9KmehQN1p34NL f4UGp38olvwqlPh9r9K1a7KBPuC3cjl7mii9vi/PffcTx09IXJZU9MOog== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdejfedgleelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetnhgurhgvihcuifhhvghriigrnhcuoegrnhgurhgvihes ghhhvghriigrnhdrtghomheqnecuggftrfgrthhtvghrnhepjefhvefhgefgffejgeelke ejleeiffejgffgkeeggfffgfffieeffeeghefhtdffnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomheprghnughrvghisehghhgvrhiirghnrdgtoh hm X-ME-Proxy: Feedback-ID: i68994715:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 25 Aug 2022 12:30:47 -0400 (EDT) From: Andrei Gherzan To: openembedded-core@lists.openembedded.org Cc: andrei@gherzan.com, Andrei Gherzan Subject: [kirkstone][PATCH 2/3] rootfspostcommands.py: Cleanup subid backup files generated by shadow-utils Date: Thu, 25 Aug 2022 18:30:40 +0200 Message-Id: <20220825163041.840129-2-andrei@gherzan.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220825163041.840129-1-andrei@gherzan.com> References: <20220825163041.840129-1-andrei@gherzan.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 Aug 2022 16:30:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169881 From: Andrei Gherzan When creating users, shadow-utils might create backup files for subordinate ID files (subid, subgid). Make sure we clean them up similarly to the other backup files shadow-utils creates. This is a backport from master that brings in only the cleanup of the subid backup files without the code restructure. Signed-off-by: Andrei Gherzan --- meta/lib/rootfspostcommands.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/lib/rootfspostcommands.py b/meta/lib/rootfspostcommands.py index fdb9f5b850..12f66d2ce2 100644 --- a/meta/lib/rootfspostcommands.py +++ b/meta/lib/rootfspostcommands.py @@ -58,3 +58,10 @@ def sort_passwd(sysconfdir): remove_backup(filename) if os.path.exists(filename): sort_file(filename, mapping) + # Drop other known backup shadow-utils. + for filename in ( + 'subgid', + 'subuid', + ): + filepath = os.path.join(sysconfdir, filename) + remove_backup(filepath)