commit: ec59a48305783e56b768213073e7cf21e1349f00
Author: Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
AuthorDate: Thu Feb 4 11:07:19 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <catalyst <AT> 0xdc.io>
Signed-off-by: Matt Turner <mattst88 <AT> 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"]]
