commit: 6ef1d63861248098654bd8f211f929f8c6b6c63b Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat Dec 19 01:58:42 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Dec 19 02:56:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6ef1d638
catalyst: Remove some redundant set_stage_path()s We only need to override root_path, and stage_path will be configured properly. Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> catalyst/targets/embedded.py | 5 ----- catalyst/targets/stage1.py | 5 ----- 2 files changed, 10 deletions(-) diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index e9138437..918b36bf 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst/targets/embedded.py @@ -65,11 +65,6 @@ class embedded(StageBase): "clear_autoresume", ]) - def set_stage_path(self): - self.settings["stage_path"] = normpath( - self.settings["chroot_path"]+"/tmp/mergeroot") - log.info('embedded stage path is %s', self.settings['stage_path']) - def set_root_path(self): self.settings["root_path"] = normpath("/tmp/mergeroot") log.info('embedded root path is %s', self.settings['root_path']) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index be3eae93..5aa27bb9 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -23,11 +23,6 @@ class stage1(StageBase): def __init__(self, spec, addlargs): StageBase.__init__(self, spec, addlargs) - def set_stage_path(self): - self.settings["stage_path"] = normpath( - self.settings["chroot_path"]+self.settings["root_path"]) - log.notice('stage1 stage path is %s', self.settings['stage_path']) - def set_root_path(self): # sets the root path, relative to 'chroot_path', of the stage1 root self.settings["root_path"] = normpath("/tmp/stage1root")