| 1 |
commit: 6dce47a175ec2508eac1e04e5df42efc58baf398 |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 22 03:44:54 2018 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 22 03:44:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6dce47a1 |
| 7 |
|
| 8 |
do not rewrite make.conf if sticky-config is set |
| 9 |
|
| 10 |
we don't want to re-write the user's make.conf if sticky-config is set, |
| 11 |
it may have been modified during fsscript and the user asked for their |
| 12 |
config to be preserved |
| 13 |
|
| 14 |
catalyst/base/stagebase.py | 5 +++-- |
| 15 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 18 |
index eaed73fc..c249295a 100644 |
| 19 |
--- a/catalyst/base/stagebase.py |
| 20 |
+++ b/catalyst/base/stagebase.py |
| 21 |
@@ -1231,8 +1231,9 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 22 |
if os.path.exists(overlay): |
| 23 |
clear_path(overlay) |
| 24 |
|
| 25 |
- # re-write the make.conf to be sure it is clean |
| 26 |
- self.write_make_conf(setup=False) |
| 27 |
+ if "sticky-config" not in self.settings["options"]): |
| 28 |
+ # re-write the make.conf to be sure it is clean |
| 29 |
+ self.write_make_conf(setup=False) |
| 30 |
|
| 31 |
# Clean up old and obsoleted files in /etc |
| 32 |
if os.path.exists(self.settings["stage_path"]+"/etc"): |
Archives