Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 3/7] catalyst: Remove some redundant set_stage_path()s
Date: Sun, 20 Dec 2020 02:28:59
Message-Id: 20201220022848.249207-3-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 1/7] catalyst: Set stage_path = chroot_path + root_path by Matt Turner
1 We only need to override root_path, and stage_path will be configured
2 properly.
3
4 Signed-off-by: Matt Turner <mattst88@g.o>
5 ---
6 catalyst/targets/embedded.py | 5 -----
7 catalyst/targets/stage1.py | 5 -----
8 2 files changed, 10 deletions(-)
9
10 diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
11 index e9138437..918b36bf 100644
12 --- a/catalyst/targets/embedded.py
13 +++ b/catalyst/targets/embedded.py
14 @@ -65,11 +65,6 @@ class embedded(StageBase):
15 "clear_autoresume",
16 ])
17
18 - def set_stage_path(self):
19 - self.settings["stage_path"] = normpath(
20 - self.settings["chroot_path"]+"/tmp/mergeroot")
21 - log.info('embedded stage path is %s', self.settings['stage_path'])
22 -
23 def set_root_path(self):
24 self.settings["root_path"] = normpath("/tmp/mergeroot")
25 log.info('embedded root path is %s', self.settings['root_path'])
26 diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
27 index be3eae93..5aa27bb9 100644
28 --- a/catalyst/targets/stage1.py
29 +++ b/catalyst/targets/stage1.py
30 @@ -23,11 +23,6 @@ class stage1(StageBase):
31 def __init__(self, spec, addlargs):
32 StageBase.__init__(self, spec, addlargs)
33
34 - def set_stage_path(self):
35 - self.settings["stage_path"] = normpath(
36 - self.settings["chroot_path"]+self.settings["root_path"])
37 - log.notice('stage1 stage path is %s', self.settings['stage_path'])
38 -
39 def set_root_path(self):
40 # sets the root path, relative to 'chroot_path', of the stage1 root
41 self.settings["root_path"] = normpath("/tmp/stage1root")
42 --
43 2.26.2