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 44C0E13835C for ; Sun, 21 Feb 2021 02:05:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92569E08A0; Sun, 21 Feb 2021 02:05:57 +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 781FBE08A0 for ; Sun, 21 Feb 2021 02:05:57 +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 9014F340FB1 for ; Sun, 21 Feb 2021 02:05:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3DFE4EE for ; Sun, 21 Feb 2021 02:05:54 +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: <1613873139.c1f5707a9c9f27f730aad908c8f3c86075201fc9.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: c1f5707a9c9f27f730aad908c8f3c86075201fc9 X-VCS-Branch: master Date: Sun, 21 Feb 2021 02:05:54 +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: ebeec9f9-d5af-41b6-886a-2412e6056dfa X-Archives-Hash: 4c27d0d93c7ba3ef7fb06824b5bc9487 Message-ID: <20210221020554.pQkJKELBC_GAOYlf5OZTJbvhIMZo6RXX8AzE9m9JrGM@z> commit: c1f5707a9c9f27f730aad908c8f3c86075201fc9 Author: Daniel Cordero 0xdc io> AuthorDate: Thu Feb 4 11:07:19 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Feb 21 02:05:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c1f5707a 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> catalyst/base/stagebase.py | 1 + 1 file changed, 1 insertion(+) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index bc0eccd0..a4da7eb3 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -465,6 +465,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_cleanables(self): self.settings['cleanables'] = [ + "/etc/machine-id", "/etc/resolv.conf", "/var/tmp/*", "/tmp/*",