1 |
From: "W. Trevor King" <wking@×××××××.us> |
2 |
|
3 |
_copy_initramfs_overlay() is long enough that it makes reading |
4 |
_build_kernel() difficult. |
5 |
--- |
6 |
modules/generic_stage_target.py | 41 ++++++++++++++++++++++------------------- |
7 |
1 file changed, 22 insertions(+), 19 deletions(-) |
8 |
|
9 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
10 |
index 337ab16..e741fcd 100644 |
11 |
--- a/modules/generic_stage_target.py |
12 |
+++ b/modules/generic_stage_target.py |
13 |
@@ -1452,25 +1452,7 @@ class generic_stage_target(generic_target): |
14 |
self.settings["boot/kernel/"+kname+\ |
15 |
"/extraversion"] |
16 |
|
17 |
- if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
18 |
- if os.path.exists(self.settings["boot/kernel/"+\ |
19 |
- kname+"/initramfs_overlay"]): |
20 |
- print "Copying initramfs_overlay dir "+\ |
21 |
- self.settings["boot/kernel/"+kname+\ |
22 |
- "/initramfs_overlay"] |
23 |
- |
24 |
- cmd("mkdir -p "+\ |
25 |
- self.settings["chroot_path"]+\ |
26 |
- "/tmp/initramfs_overlay/"+\ |
27 |
- self.settings["boot/kernel/"+kname+\ |
28 |
- "/initramfs_overlay"],env=self.env) |
29 |
- |
30 |
- cmd("cp -R "+self.settings["boot/kernel/"+\ |
31 |
- kname+"/initramfs_overlay"]+"/* "+\ |
32 |
- self.settings["chroot_path"]+\ |
33 |
- "/tmp/initramfs_overlay/"+\ |
34 |
- self.settings["boot/kernel/"+kname+\ |
35 |
- "/initramfs_overlay"],env=self.env) |
36 |
+ self._copy_initramfs_overlay(kname=kname) |
37 |
|
38 |
""" Execute the script that builds the kernel """ |
39 |
cmd("/bin/bash "+self.settings["controller_file"]+\ |
40 |
@@ -1520,6 +1502,27 @@ class generic_stage_target(generic_target): |
41 |
except CatalystError: |
42 |
self.unbind() |
43 |
|
44 |
+ def _copy_initramfs_overlay(self, kname): |
45 |
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
46 |
+ if os.path.exists(self.settings["boot/kernel/"+\ |
47 |
+ kname+"/initramfs_overlay"]): |
48 |
+ print "Copying initramfs_overlay dir "+\ |
49 |
+ self.settings["boot/kernel/"+kname+\ |
50 |
+ "/initramfs_overlay"] |
51 |
+ |
52 |
+ cmd("mkdir -p "+\ |
53 |
+ self.settings["chroot_path"]+\ |
54 |
+ "/tmp/initramfs_overlay/"+\ |
55 |
+ self.settings["boot/kernel/"+kname+\ |
56 |
+ "/initramfs_overlay"],env=self.env) |
57 |
+ |
58 |
+ cmd("cp -R "+self.settings["boot/kernel/"+\ |
59 |
+ kname+"/initramfs_overlay"]+"/* "+\ |
60 |
+ self.settings["chroot_path"]+\ |
61 |
+ "/tmp/initramfs_overlay/"+\ |
62 |
+ self.settings["boot/kernel/"+kname+\ |
63 |
+ "/initramfs_overlay"],env=self.env) |
64 |
+ |
65 |
def bootloader(self): |
66 |
if "AUTORESUME" in self.settings \ |
67 |
and os.path.exists(self.settings["autoresume_path"]+"bootloader"): |
68 |
-- |
69 |
1.8.1.336.g94702dd |