1 |
Signed-off-by: Matt Turner <mattst88@g.o> |
2 |
--- |
3 |
catalyst/base/stagebase.py | 13 ++++++------- |
4 |
catalyst/targets/embedded.py | 6 ------ |
5 |
catalyst/targets/livecd_stage1.py | 6 ------ |
6 |
catalyst/targets/livecd_stage2.py | 6 ------ |
7 |
catalyst/targets/netboot.py | 6 ------ |
8 |
catalyst/targets/stage4.py | 6 ------ |
9 |
6 files changed, 6 insertions(+), 37 deletions(-) |
10 |
|
11 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
12 |
index 53b0a224..3b8d3a6e 100644 |
13 |
--- a/catalyst/base/stagebase.py |
14 |
+++ b/catalyst/base/stagebase.py |
15 |
@@ -84,7 +84,12 @@ class StageBase(TargetBase, ClearBase, GenBase): |
16 |
"portage_overlay", |
17 |
"portage_prefix", |
18 |
]) |
19 |
- self.prepare_sequence = [] |
20 |
+ self.prepare_sequence = [ |
21 |
+ self.unpack, |
22 |
+ self.config_profile_link, |
23 |
+ self.setup_confdir, |
24 |
+ self.portage_overlay, |
25 |
+ ] |
26 |
self.build_sequence = [] |
27 |
self.finish_sequence = [] |
28 |
|
29 |
@@ -498,12 +503,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
30 |
|
31 |
def set_action_sequence(self): |
32 |
"""Set basic stage1, 2, 3 action sequences""" |
33 |
- self.prepare_sequence.extend([ |
34 |
- self.unpack, |
35 |
- self.config_profile_link, |
36 |
- self.setup_confdir, |
37 |
- self.portage_overlay, |
38 |
- ]) |
39 |
self.build_sequence.extend([ |
40 |
self.bind, |
41 |
self.chroot_setup, |
42 |
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py |
43 |
index 7d328808..83b17ad2 100644 |
44 |
--- a/catalyst/targets/embedded.py |
45 |
+++ b/catalyst/targets/embedded.py |
46 |
@@ -41,12 +41,6 @@ class embedded(StageBase): |
47 |
StageBase.__init__(self, spec, addlargs) |
48 |
|
49 |
def set_action_sequence(self): |
50 |
- self.prepare_sequence.extend([ |
51 |
- self.unpack, |
52 |
- self.config_profile_link, |
53 |
- self.setup_confdir, |
54 |
- self.portage_overlay, |
55 |
- ]) |
56 |
self.build_sequence.extend([ |
57 |
self.bind, |
58 |
self.chroot_setup, |
59 |
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py |
60 |
index eb6bb0f0..9fe95a00 100644 |
61 |
--- a/catalyst/targets/livecd_stage1.py |
62 |
+++ b/catalyst/targets/livecd_stage1.py |
63 |
@@ -23,12 +23,6 @@ class livecd_stage1(StageBase): |
64 |
StageBase.__init__(self, spec, addlargs) |
65 |
|
66 |
def set_action_sequence(self): |
67 |
- self.prepare_sequence.extend([ |
68 |
- self.unpack, |
69 |
- self.config_profile_link, |
70 |
- self.setup_confdir, |
71 |
- self.portage_overlay, |
72 |
- ]) |
73 |
self.build_sequence.extend([ |
74 |
self.bind, |
75 |
self.chroot_setup, |
76 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
77 |
index 5fecff85..ab8f4a0e 100644 |
78 |
--- a/catalyst/targets/livecd_stage2.py |
79 |
+++ b/catalyst/targets/livecd_stage2.py |
80 |
@@ -86,12 +86,6 @@ class livecd_stage2(StageBase): |
81 |
print_traceback=True) |
82 |
|
83 |
def set_action_sequence(self): |
84 |
- self.prepare_sequence.extend([ |
85 |
- self.unpack, |
86 |
- self.config_profile_link, |
87 |
- self.setup_confdir, |
88 |
- self.portage_overlay, |
89 |
- ]) |
90 |
self.build_sequence.extend([ |
91 |
self.bind, |
92 |
self.chroot_setup, |
93 |
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py |
94 |
index 9a7e59e5..cb5e7ae4 100644 |
95 |
--- a/catalyst/targets/netboot.py |
96 |
+++ b/catalyst/targets/netboot.py |
97 |
@@ -158,12 +158,6 @@ class netboot(StageBase): |
98 |
self.resume.enable("empty") |
99 |
|
100 |
def set_action_sequence(self): |
101 |
- self.prepare_sequence.extend([ |
102 |
- self.unpack, |
103 |
- self.config_profile_link, |
104 |
- self.setup_confdir, |
105 |
- self.portage_overlay, |
106 |
- ]) |
107 |
self.build_sequence.extend([ |
108 |
self.bind, |
109 |
self.chroot_setup, |
110 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
111 |
index 997139a5..9e53f070 100644 |
112 |
--- a/catalyst/targets/stage4.py |
113 |
+++ b/catalyst/targets/stage4.py |
114 |
@@ -39,12 +39,6 @@ class stage4(StageBase): |
115 |
self.settings["cleanables"].remove('/etc/resolv.conf') |
116 |
|
117 |
def set_action_sequence(self): |
118 |
- self.prepare_sequence.extend([ |
119 |
- self.unpack, |
120 |
- self.config_profile_link, |
121 |
- self.setup_confdir, |
122 |
- self.portage_overlay, |
123 |
- ]) |
124 |
self.build_sequence.extend([ |
125 |
self.bind, |
126 |
self.chroot_setup, |
127 |
-- |
128 |
2.26.2 |