Dennis Gilmore b0b385
diff -uNr appliance-tools-005-orig/appcreate/appliance.py appliance-tools-005/appcreate/appliance.py
Dennis Gilmore b0b385
--- appliance-tools-005-orig/appcreate/appliance.py	2010-09-06 18:43:21.000000000 -0500
Dennis Gilmore 2dbd06
+++ appliance-tools-005/appcreate/appliance.py	2011-10-29 09:15:41.000000000 -0500
Dennis Gilmore b0b385
@@ -253,11 +253,10 @@
Dennis Gilmore b0b385
         for f in files:
Dennis Gilmore b0b385
             path = imgpath + "/" + f
Dennis Gilmore b0b385
             if not os.path.isfile(path):
Dennis Gilmore b0b385
-                raise CreatorError("grub not installed : "
Dennis Gilmore b0b385
-                                   "%s not found" % path)
Dennis Gilmore b0b385
-
Dennis Gilmore b0b385
-            logging.debug("Copying %s to %s/boot/grub/%s" %(path, self._instroot, f))
Dennis Gilmore b0b385
-            shutil.copy(path, self._instroot + "/boot/grub/" + f)
Dennis Gilmore b0b385
+                logging.debug("grub file %s not found assume we are ok " % path)
Dennis Gilmore b0b385
+                 
Dennis Gilmore b0b385
+            logging.debug("Not Copying %s to %s/boot/grub/%s" %(path, self._instroot, f))
Dennis Gilmore b0b385
+            #shutil.copy(path, self._instroot + "/boot/grub/" + f)
Dennis Gilmore b0b385
 
Dennis Gilmore b0b385
     def _install_grub(self):
Dennis Gilmore b0b385
         (bootdevnum, rootdevnum, rootdev, prefix) = self._get_grub_boot_config()
Dennis Gilmore 2dbd06
@@ -278,12 +277,12 @@
Dennis Gilmore 2dbd06
         setup += "quit\n"
Dennis Gilmore 2dbd06
 
Dennis Gilmore 2dbd06
         logging.debug("Installing grub to %s" % loopdev)
Dennis Gilmore 2dbd06
-        grub = subprocess.Popen(["/sbin/grub", "--batch", "--no-floppy"],
Dennis Gilmore 2dbd06
-                                stdin=subprocess.PIPE)
Dennis Gilmore 2dbd06
-        grub.communicate(setup)
Dennis Gilmore 2dbd06
-        rc = grub.wait()
Dennis Gilmore 2dbd06
-        if rc != 0:
Dennis Gilmore 2dbd06
-            raise MountError("Unable to install grub bootloader")
Dennis Gilmore 2dbd06
+        #grub = subprocess.Popen(["/sbin/grub", "--batch", "--no-floppy"],
Dennis Gilmore 2dbd06
+        #                        stdin=subprocess.PIPE)
Dennis Gilmore 2dbd06
+        #grub.communicate(setup)
Dennis Gilmore 2dbd06
+        #rc = grub.wait()
Dennis Gilmore 2dbd06
+        #if rc != 0:
Dennis Gilmore 2dbd06
+        #    raise MountError("Unable to install grub bootloader")
Dennis Gilmore 2dbd06
 
Dennis Gilmore 2dbd06
     def _create_bootconfig(self):
Dennis Gilmore 2dbd06
         self._create_grub_devices()