Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/
Date: Thu, 10 Jun 2021 00:48:49
Message-Id: 1613873139.c1f5707a9c9f27f730aad908c8f3c86075201fc9.mattst88@gentoo
1 commit: c1f5707a9c9f27f730aad908c8f3c86075201fc9
2 Author: Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
3 AuthorDate: Thu Feb 4 11:07:19 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 21 02:05:39 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c1f5707a
7
8 catalyst: Remove /etc/machine-id in all stages
9
10 Machine IDs are unique per installation, but if they are retained in a
11 stage tarball, all installations from that stage share the same machine
12 id.
13
14 Signed-off-by: Daniel Cordero <catalyst <AT> 0xdc.io>
15 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
16
17 catalyst/base/stagebase.py | 1 +
18 1 file changed, 1 insertion(+)
19
20 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
21 index bc0eccd0..a4da7eb3 100644
22 --- a/catalyst/base/stagebase.py
23 +++ b/catalyst/base/stagebase.py
24 @@ -465,6 +465,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
25
26 def set_cleanables(self):
27 self.settings['cleanables'] = [
28 + "/etc/machine-id",
29 "/etc/resolv.conf",
30 "/var/tmp/*",
31 "/tmp/*",