diff options
| author |   Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2018-02-21 22:44:54 -0500 |
|---|---|---|
| committer | Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2018-02-21 22:44:54 -0500 |
| commit | 6dce47a175ec2508eac1e04e5df42efc58baf398 (patch) | |
| tree | 71c8c6eca6381c21a594f3754acc8dd6b27ab849 | |
| parent | Added verbose support for genkernel, and callback emerge (diff) | |
| download | catalyst-6dce47a1.tar.gz catalyst-6dce47a1.tar.bz2 catalyst-6dce47a1.zip | |
do not rewrite make.conf if sticky-config is set
we don't want to re-write the user's make.conf if sticky-config is set,
it may have been modified during fsscript and the user asked for their
config to be preserved
| -rw-r--r-- | catalyst/base/stagebase.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index eaed73fc..c249295a 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1231,8 +1231,9 @@ class StageBase(TargetBase, ClearBase, GenBase): if os.path.exists(overlay): clear_path(overlay) - # re-write the make.conf to be sure it is clean - self.write_make_conf(setup=False) + if "sticky-config" not in self.settings["options"]): + # re-write the make.conf to be sure it is clean + self.write_make_conf(setup=False) # Clean up old and obsoleted files in /etc if os.path.exists(self.settings["stage_path"]+"/etc"): |