| 1 |
commit: 6a4fa88d18afefc4aac328dd5bf60d2a13026f2e |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 23 04:28:48 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 23 04:29:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6a4fa88d |
| 7 |
|
| 8 |
catalyst: Explicitly keep /etc/resolv.conf in stage4 |
| 9 |
|
| 10 |
It was confusing to understand that /etc/resolv.conf was *kept* in |
| 11 |
stage4 because its set_cleanables() contained everything except it. |
| 12 |
|
| 13 |
This will simplify things if we want to add more common items to the |
| 14 |
cleanables list. |
| 15 |
|
| 16 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 17 |
|
| 18 |
catalyst/targets/stage4.py | 6 +++++- |
| 19 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
| 22 |
index a9b3c936..346c0845 100644 |
| 23 |
--- a/catalyst/targets/stage4.py |
| 24 |
+++ b/catalyst/targets/stage4.py |
| 25 |
@@ -32,7 +32,11 @@ class stage4(StageBase): |
| 26 |
StageBase.__init__(self, spec, addlargs) |
| 27 |
|
| 28 |
def set_cleanables(self): |
| 29 |
- self.settings["cleanables"] = ["/var/tmp/*", "/tmp/*"] |
| 30 |
+ StageBase.set_cleanables(self) |
| 31 |
+ |
| 32 |
+ # We want to allow stage4's fsscript to generate a default |
| 33 |
+ # /etc/resolv.conf |
| 34 |
+ self.settings["cleanables"].remove('/etc/resolv.conf') |
| 35 |
|
| 36 |
def set_action_sequence(self): |
| 37 |
self.settings['action_sequence'] = [ |
Archives