| 1 |
Ensures that we don't overwrite and lose some settings. |
| 2 |
|
| 3 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 4 |
--- |
| 5 |
catalyst/base/stagebase.py | 6 +++--- |
| 6 |
catalyst/targets/embedded.py | 4 ++-- |
| 7 |
catalyst/targets/livecd_stage1.py | 4 ++-- |
| 8 |
catalyst/targets/livecd_stage2.py | 8 ++++---- |
| 9 |
catalyst/targets/netboot.py | 4 ++-- |
| 10 |
catalyst/targets/stage4.py | 4 ++-- |
| 11 |
6 files changed, 15 insertions(+), 15 deletions(-) |
| 12 |
|
| 13 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 14 |
index 801df2fb..46b7c59c 100644 |
| 15 |
--- a/catalyst/base/stagebase.py |
| 16 |
+++ b/catalyst/base/stagebase.py |
| 17 |
@@ -478,13 +478,13 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 18 |
Or it calls the normal set_action_sequence() for the target stage. |
| 19 |
""" |
| 20 |
if "purgeonly" in self.settings["options"]: |
| 21 |
- self.action_sequence = ["remove_chroot"] |
| 22 |
+ self.action_sequence.append("remove_chroot") |
| 23 |
return |
| 24 |
self.set_action_sequence() |
| 25 |
|
| 26 |
def set_action_sequence(self): |
| 27 |
"""Set basic stage1, 2, 3 action sequences""" |
| 28 |
- self.action_sequence = [ |
| 29 |
+ self.action_sequence.extend([ |
| 30 |
"unpack", |
| 31 |
"setup_confdir", |
| 32 |
"portage_overlay", |
| 33 |
@@ -495,7 +495,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 34 |
"preclean", |
| 35 |
"unbind", |
| 36 |
"clean", |
| 37 |
- ] |
| 38 |
+ ]) |
| 39 |
self.set_completion_action_sequences() |
| 40 |
|
| 41 |
def set_completion_action_sequences(self): |
| 42 |
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py |
| 43 |
index 3899cf1b..75eb68e4 100644 |
| 44 |
--- a/catalyst/targets/embedded.py |
| 45 |
+++ b/catalyst/targets/embedded.py |
| 46 |
@@ -41,7 +41,7 @@ class embedded(StageBase): |
| 47 |
StageBase.__init__(self, spec, addlargs) |
| 48 |
|
| 49 |
def set_action_sequence(self): |
| 50 |
- self.action_sequence = [ |
| 51 |
+ self.action_sequence.extend([ |
| 52 |
"unpack", |
| 53 |
"config_profile_link", |
| 54 |
"setup_confdir", |
| 55 |
@@ -60,7 +60,7 @@ class embedded(StageBase): |
| 56 |
"clean", |
| 57 |
"capture", |
| 58 |
"clear_autoresume", |
| 59 |
- ] |
| 60 |
+ ]) |
| 61 |
|
| 62 |
def set_stage_path(self): |
| 63 |
self.settings["stage_path"] = normpath( |
| 64 |
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py |
| 65 |
index b8c26cb1..9dbfa506 100644 |
| 66 |
--- a/catalyst/targets/livecd_stage1.py |
| 67 |
+++ b/catalyst/targets/livecd_stage1.py |
| 68 |
@@ -23,7 +23,7 @@ class livecd_stage1(StageBase): |
| 69 |
StageBase.__init__(self, spec, addlargs) |
| 70 |
|
| 71 |
def set_action_sequence(self): |
| 72 |
- self.action_sequence = [ |
| 73 |
+ self.action_sequence.extend([ |
| 74 |
"unpack", |
| 75 |
"config_profile_link", |
| 76 |
"setup_confdir", |
| 77 |
@@ -34,7 +34,7 @@ class livecd_stage1(StageBase): |
| 78 |
"build_packages", |
| 79 |
"unbind", |
| 80 |
"clean", |
| 81 |
- ] |
| 82 |
+ ]) |
| 83 |
self.set_completion_action_sequences() |
| 84 |
|
| 85 |
def set_spec_prefix(self): |
| 86 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 87 |
index cac16b6e..c9b5ce08 100644 |
| 88 |
--- a/catalyst/targets/livecd_stage2.py |
| 89 |
+++ b/catalyst/targets/livecd_stage2.py |
| 90 |
@@ -87,7 +87,7 @@ class livecd_stage2(StageBase): |
| 91 |
print_traceback=True) |
| 92 |
|
| 93 |
def set_action_sequence(self): |
| 94 |
- self.action_sequence = [ |
| 95 |
+ self.action_sequence.extend([ |
| 96 |
"unpack", |
| 97 |
"config_profile_link", |
| 98 |
"setup_confdir", |
| 99 |
@@ -97,9 +97,9 @@ class livecd_stage2(StageBase): |
| 100 |
"setup_environment", |
| 101 |
"run_local", |
| 102 |
"build_kernel" |
| 103 |
- ] |
| 104 |
+ ]) |
| 105 |
if "fetch" not in self.settings["options"]: |
| 106 |
- self.action_sequence += [ |
| 107 |
+ self.action_sequence.extend([ |
| 108 |
"bootloader", |
| 109 |
"preclean", |
| 110 |
"livecd_update", |
| 111 |
@@ -114,5 +114,5 @@ class livecd_stage2(StageBase): |
| 112 |
"target_setup", |
| 113 |
"setup_overlay", |
| 114 |
"create_iso", |
| 115 |
- ] |
| 116 |
+ ]) |
| 117 |
self.action_sequence.append("clear_autoresume") |
| 118 |
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py |
| 119 |
index 61583f0d..e5c6d43c 100644 |
| 120 |
--- a/catalyst/targets/netboot.py |
| 121 |
+++ b/catalyst/targets/netboot.py |
| 122 |
@@ -160,7 +160,7 @@ class netboot(StageBase): |
| 123 |
self.resume.enable("empty") |
| 124 |
|
| 125 |
def set_action_sequence(self): |
| 126 |
- self.action_sequence = [ |
| 127 |
+ self.action_sequence.extend([ |
| 128 |
"unpack", |
| 129 |
"config_profile_link", |
| 130 |
"setup_confdir", |
| 131 |
@@ -179,4 +179,4 @@ class netboot(StageBase): |
| 132 |
"unbind", |
| 133 |
"clean", |
| 134 |
"clear_autoresume", |
| 135 |
- ] |
| 136 |
+ ]) |
| 137 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
| 138 |
index eef24a73..bb20be79 100644 |
| 139 |
--- a/catalyst/targets/stage4.py |
| 140 |
+++ b/catalyst/targets/stage4.py |
| 141 |
@@ -39,7 +39,7 @@ class stage4(StageBase): |
| 142 |
self.settings["cleanables"].remove('/etc/resolv.conf') |
| 143 |
|
| 144 |
def set_action_sequence(self): |
| 145 |
- self.action_sequence = [ |
| 146 |
+ self.action_sequence.extend([ |
| 147 |
"unpack", |
| 148 |
"config_profile_link", |
| 149 |
"setup_confdir", |
| 150 |
@@ -59,5 +59,5 @@ class stage4(StageBase): |
| 151 |
"remove", |
| 152 |
"empty", |
| 153 |
"clean", |
| 154 |
- ] |
| 155 |
+ ]) |
| 156 |
self.set_completion_action_sequences() |
| 157 |
-- |
| 158 |
2.26.2 |
Archives