7044350 livecd install fails due to cpio transfer error
authorKaren Tung <karen.tung@oracle.com>
Thu, 12 May 2011 15:30:06 -0700
changeset 1123 7f09b2655fe1
parent 1122 d30415c63b07
child 1124 718af6973b01
7044350 livecd install fails due to cpio transfer error
usr/src/cmd/distro_const/checkpoints/pkg_img_mod.py
--- a/usr/src/cmd/distro_const/checkpoints/pkg_img_mod.py	Thu May 12 11:06:35 2011 -0600
+++ b/usr/src/cmd/distro_const/checkpoints/pkg_img_mod.py	Thu May 12 15:30:06 2011 -0700
@@ -329,6 +329,33 @@
                 save_files.append(relpath)
 
         self.add_content_list_to_doc(save_files)
+
+    def create_livecd_content_file(self):
+        """ class method to create the .livecd-cdrom-content file
+        """
+
+        # save the current working directory
+	cwd = os.getcwd()
+
+        # change to the pkg_img_path
+        os.chdir(self.pkg_img_path)
+
+        content_list = []
+        for root, dirs, files in os.walk("."):
+            for f in files:
+                if not f.endswith(".zlib") and not f.endswith(".image_info") \
+                    and not f.endswith("boot_archive") and not \
+                    f.endswith(".livecd-cdrom-content") and not \
+                    f.endswith(".media-transfer.xml"):
+                        content_list.append(os.path.join(root, f))
+            for d in dirs:
+                content_list.append(os.path.join(root, d))
+
+        with open(".livecd-cdrom-content", "w") as fh:
+            for entry in content_list:
+                fh.write(entry + "\n")
+
+        os.chdir(cwd)
         
     def execute(self, dry_run=False):
         """Customize the pkg_image area. Assumes that a populated pkg_image
@@ -409,6 +436,11 @@
         # populate live cd's content into DOC
         self.populate_livecd_content()
 
+        # The following call and the function implementation
+        # should be removed once the GUI installer
+        # moves to the CUD architecture
+        self.create_livecd_content_file()
+
 
 class TextPkgImgMod(PkgImgMod, Checkpoint):
     """ TextPkgImgMod - class to modify the pkg_image directory after the boot