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 A6D781382C5 for ; Thu, 4 Feb 2021 11:08:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C34D9E08F6; Thu, 4 Feb 2021 11:08:04 +0000 (UTC) Received: from rs234.mailgun.us (rs234.mailgun.us [209.61.151.234]) (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 5DDC5E08F6 for ; Thu, 4 Feb 2021 11:08:04 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=0xdc.io; q=dns/txt; s=smtp; t=1612436884; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: To: From: Sender; bh=P7QgF0ClUdmOtxOxsfqF5FTSjrtjFGEgTu1hbHz8vuM=; b=GjceZfZ3U4wOlCJz3fXq+s1OvLIb30PN4hAy650ix2CW+FecaR4SvWE/3qGzQhvK9oMG499g JjIi3J36waOuy2WKzl3lUNpyXHHDo28GGAZJC+bEimnEZ1Wza1j5RDzelqAe8oY0ATYQy0oW sj9rMyQsXqpVJ3Ism1rzF9m0tp4= X-Mailgun-Sending-Ip: 209.61.151.234 X-Mailgun-Sid: WyJiZmIxMyIsICJnZW50b28tY2F0YWx5c3RAbGlzdHMuZ2VudG9vLm9yZyIsICJmNjc0NGUiXQ== Received: from mail.0xdc.io (ip-54-37-0.eu [54.37.0.172]) by smtp-out-n02.prod.us-east-1.postgun.com with SMTP id 601bd5925d0f384787cf41a0 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Thu, 04 Feb 2021 11:08:02 GMT Sender: gentoo.catalyst=xxoo.ws@0xdc.io Received: from dysnomia (8.b.b.1.e.2.d.8.6.c.e.a.2.0.9.c.0.a.4.7.9.0.c.0.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:c09:74a0:c902:aec6:8d2e:1bb8]) (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 0BFE21023A3 for ; Thu, 4 Feb 2021 11:08:07 +0000 (UTC) From: Daniel Cordero To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH] Remove /etc/machine-id in all stages Date: Thu, 4 Feb 2021 11:07:19 +0000 Message-Id: <20210204110721.33846-2-gentoo.catalyst@xxoo.ws> X-Mailer: git-send-email 2.26.2 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: ed8998ed-d113-43db-8471-88d8e5d1347d X-Archives-Hash: 07cdd985d06db9d9694639d14c798964 From: Daniel Cordero 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 --- catalyst/base/stagebase.py | 1 + 1 file changed, 1 insertion(+) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ed4d1227..2e78b288 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -427,6 +427,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_cleanables(self): self.settings['cleanables'] = [ + "/etc/machine-id", "/etc/resolv.conf", "/var/tmp/*", "/tmp/*", -- 2.26.2