diff options
| author |   Daniel Cordero <catalyst@0xdc.io> | 2021-02-04 11:07:19 +0000 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2021-06-06 15:37:11 -0700 |
| commit | ec59a48305783e56b768213073e7cf21e1349f00 (patch) | |
| tree | 2a339c27281e3d17b72aa71a235fa3993d8c9b3d | |
| parent | catalyst 3.0.17 (diff) | |
| download | catalyst-ec59a48305783e56b768213073e7cf21e1349f00.tar.gz catalyst-ec59a48305783e56b768213073e7cf21e1349f00.tar.bz2 catalyst-ec59a48305783e56b768213073e7cf21e1349f00.zip | |
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@0xdc.io>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit c1f5707a9c9f27f730aad908c8f3c86075201fc9)
| -rw-r--r-- | catalyst/base/stagebase.py | 2 |
1 files changed, 1 insertions, 1 deletions
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"]] |