aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2021-01-17 22:15:02 -0500
committerMatt Turner <mattst88@gentoo.org>2021-01-23 11:19:07 -0500
commit4f0fa29d5a2499b7178dc4d19f7693e52eb8def9 (patch)
tree7e2c6d87312b0457c88cd1c3ce9853e94e92bb1f /catalyst
parentcatalyst: Call config_profile_link for all targets (diff)
downloadcatalyst-4f0fa29d5a2499b7178dc4d19f7693e52eb8def9.tar.gz
catalyst-4f0fa29d5a2499b7178dc4d19f7693e52eb8def9.tar.bz2
catalyst-4f0fa29d5a2499b7178dc4d19f7693e52eb8def9.zip
catalyst: Deduplicate prepare_sequence assignments
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'catalyst')
-rw-r--r--catalyst/base/stagebase.py13
-rw-r--r--catalyst/targets/embedded.py6
-rw-r--r--catalyst/targets/livecd_stage1.py6
-rw-r--r--catalyst/targets/livecd_stage2.py6
-rw-r--r--catalyst/targets/netboot.py6
-rw-r--r--catalyst/targets/stage4.py6
6 files changed, 6 insertions, 37 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 53b0a224..3b8d3a6e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -84,7 +84,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
"portage_overlay",
"portage_prefix",
])
- self.prepare_sequence = []
+ self.prepare_sequence = [
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
+ ]
self.build_sequence = []
self.finish_sequence = []
@@ -498,12 +503,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_action_sequence(self):
"""Set basic stage1, 2, 3 action sequences"""
- self.prepare_sequence.extend([
- self.unpack,
- self.config_profile_link,
- self.setup_confdir,
- self.portage_overlay,
- ])
self.build_sequence.extend([
self.bind,
self.chroot_setup,
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 7d328808..83b17ad2 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -41,12 +41,6 @@ class embedded(StageBase):
StageBase.__init__(self, spec, addlargs)
def set_action_sequence(self):
- self.prepare_sequence.extend([
- self.unpack,
- self.config_profile_link,
- self.setup_confdir,
- self.portage_overlay,
- ])
self.build_sequence.extend([
self.bind,
self.chroot_setup,
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index eb6bb0f0..9fe95a00 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -23,12 +23,6 @@ class livecd_stage1(StageBase):
StageBase.__init__(self, spec, addlargs)
def set_action_sequence(self):
- self.prepare_sequence.extend([
- self.unpack,
- self.config_profile_link,
- self.setup_confdir,
- self.portage_overlay,
- ])
self.build_sequence.extend([
self.bind,
self.chroot_setup,
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 5fecff85..ab8f4a0e 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -86,12 +86,6 @@ class livecd_stage2(StageBase):
print_traceback=True)
def set_action_sequence(self):
- self.prepare_sequence.extend([
- self.unpack,
- self.config_profile_link,
- self.setup_confdir,
- self.portage_overlay,
- ])
self.build_sequence.extend([
self.bind,
self.chroot_setup,
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 9a7e59e5..cb5e7ae4 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -158,12 +158,6 @@ class netboot(StageBase):
self.resume.enable("empty")
def set_action_sequence(self):
- self.prepare_sequence.extend([
- self.unpack,
- self.config_profile_link,
- self.setup_confdir,
- self.portage_overlay,
- ])
self.build_sequence.extend([
self.bind,
self.chroot_setup,
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 997139a5..9e53f070 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -39,12 +39,6 @@ class stage4(StageBase):
self.settings["cleanables"].remove('/etc/resolv.conf')
def set_action_sequence(self):
- self.prepare_sequence.extend([
- self.unpack,
- self.config_profile_link,
- self.setup_confdir,
- self.portage_overlay,
- ])
self.build_sequence.extend([
self.bind,
self.chroot_setup,