diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-10-22 21:28:48 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-10-22 21:29:48 -0700 |
| commit | 6a4fa88d18afefc4aac328dd5bf60d2a13026f2e (patch) | |
| tree | 0e480883ec9060c34efdd2f096432fe4bcd4361f | |
| parent | catalyst: Drop useless stage3 set_cleanables() (diff) | |
| download | catalyst-6a4fa88d18afefc4aac328dd5bf60d2a13026f2e.tar.gz catalyst-6a4fa88d18afefc4aac328dd5bf60d2a13026f2e.tar.bz2 catalyst-6a4fa88d18afefc4aac328dd5bf60d2a13026f2e.zip | |
catalyst: Explicitly keep /etc/resolv.conf in stage4
It was confusing to understand that /etc/resolv.conf was *kept* in
stage4 because its set_cleanables() contained everything except it.
This will simplify things if we want to add more common items to the
cleanables list.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | catalyst/targets/stage4.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py index a9b3c936..346c0845 100644 --- a/catalyst/targets/stage4.py +++ b/catalyst/targets/stage4.py @@ -32,7 +32,11 @@ class stage4(StageBase): StageBase.__init__(self, spec, addlargs) def set_cleanables(self): - self.settings["cleanables"] = ["/var/tmp/*", "/tmp/*"] + StageBase.set_cleanables(self) + + # We want to allow stage4's fsscript to generate a default + # /etc/resolv.conf + self.settings["cleanables"].remove('/etc/resolv.conf') def set_action_sequence(self): self.settings['action_sequence'] = [ |