14475 installer appears to remove /boot/grub/menu.lst slim_1003
authorEvan Layton <Evan.Layton@Sun.COM>
Mon, 15 Feb 2010 15:55:29 -0700
branchslim_1003
changeset 737 354667b89aa5
parent 734 2d68ac62d3ce
child 739 7e471282364d
14475 installer appears to remove /boot/grub/menu.lst
usr/src/lib/libict_pymod/ict.py
--- a/usr/src/lib/libict_pymod/ict.py	Tue Feb 09 16:51:53 2010 -0800
+++ b/usr/src/lib/libict_pymod/ict.py	Mon Feb 15 15:55:29 2010 -0700
@@ -2277,7 +2277,6 @@
         # the basedir directory that are not needed by the installed OS.
         file_cleanup_list = [ "/.livecd",
                               "/.volumeid",
-                              "/boot/grub/menu.lst",
                               "/etc/sysconfig/language",
                               "/.liveusb" ]
         dir_cleanup_list = [ "/a", "/bootcd_microroot" ]
@@ -2302,6 +2301,19 @@
                 prerror('Unexpected error deleting directory.')
                 prerror(traceback.format_exc())
 
+	# Since SUNWgrub delivers the reference grub menu file
+	# (/boot/grub/menu.lst) we'll have to copy the menu.lst
+	# file from the microroot into the installed system.
+	# Since this file is for reference only if the copy
+	# fails we don't want to stop the install for this but
+	# we should log it.
+	try:
+            shutil.copy2("/boot/grub/menu.lst", self.basedir + \
+                "/boot/grub/menu.lst")
+	except OSError, (errno, strerror):
+            prerror('Error copying /boot/grub/menu.lst to ' + self.basedir + \
+                '/boot/grub/menu.lst :' + strerror)
+
         # The bootcd_microroot directory should be cleaned up in the
         # Distribution Constructor once they have finished the redesign.
         for basedname in dir_cleanup_list: