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