Replace content on master with content from catalyst_2

[catalyst.git] / modules / netboot2_target.py

diff --git a/modules/netboot2_target.py b/modules/netboot2_target.py
index 3738062a9f5e4f91a766e0a35cd4796e373d39ec..444f873c098324e71c4b69934e0e2562bbf4465d 100644 (file)
--- a/modules/netboot2_target.py
+++ b/modules/netboot2_target.py
@@ -18,7 +18,9 @@ class netboot2_target(generic_stage_target):
                        "netboot2/use",
                        "netboot2/extra_files",
                        "netboot2/overlay",
-                       "netboot2/busybox_config"
+                       "netboot2/busybox_config",
+                       "netboot2/root_overlay",
+                       "netboot2/linuxrc"
                ])
 
                try:
@@ -99,7 +101,7 @@ class netboot2_target(generic_stage_target):
                                for x in self.settings["netboot2/overlay"]: 
                                        if os.path.exists(x):
                                                cmd("rsync -a "+x+"/ "+\
-                                                       self.settings["chroot_path"], "netboot2/overlay: "+x+" copy failed.",env=self.env)
+                                                       self.settings["chroot_path"] + self.settings["merge_path"], "netboot2/overlay: "+x+" copy failed.",env=self.env)
                                touch(self.settings["autoresume_path"]+"setup_overlay")
 
        def move_kernels(self):