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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E5421382C5 for ; Sun, 6 Jun 2021 22:38:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C7DFE0887; Sun, 6 Jun 2021 22:38:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 04A81E0887 for ; Sun, 6 Jun 2021 22:38:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3886340CC9 for ; Sun, 6 Jun 2021 22:38:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFF5F235 for ; Sun, 6 Jun 2021 22:38:38 +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: <1623019031.ec59a48305783e56b768213073e7cf21e1349f00.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:catalyst-3.0-stable 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: ec59a48305783e56b768213073e7cf21e1349f00 X-VCS-Branch: catalyst-3.0-stable Date: Sun, 6 Jun 2021 22:38:38 +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: c3e1da4b-3812-4b30-89e5-e31e306165f3 X-Archives-Hash: 43241e383a49e6abcd44ef78ca01dd06 commit: ec59a48305783e56b768213073e7cf21e1349f00 Author: Daniel Cordero 0xdc io> AuthorDate: Thu Feb 4 11:07:19 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Jun 6 22:37:11 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ec59a483 catalyst: Remove /etc/machine-id in all stages Machine IDs are unique per installation, but if they are retained in a stage tarball, all installations from that stage share the same machine id. Signed-off-by: Daniel Cordero 0xdc.io> Signed-off-by: Matt Turner gentoo.org> (cherry picked from commit c1f5707a9c9f27f730aad908c8f3c86075201fc9) catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index bb8f29da..770d1b35 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -470,7 +470,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["destpath"] = normpath(self.settings["chroot_path"]) def set_cleanables(self): - self.settings["cleanables"] = ["/etc/resolv.conf", "/var/tmp/*", "/tmp/*", + self.settings["cleanables"] = ["/etc/machine-id", "/etc/resolv.conf", "/var/tmp/*", "/tmp/*", self.settings["repo_basedir"] + "/" + self.settings["repo_name"]]