Dennis Gilmore 4921ca
From cdbd090ceeaec09820f5fa78946fe7adcb7a2256 Mon Sep 17 00:00:00 2001
Dennis Gilmore 9aba84
From: Dennis Gilmore <dennis@ausil.us>
Dennis Gilmore 4921ca
Date: Tue, 13 Mar 2012 12:22:39 -0500
Dennis Gilmore 9aba84
Subject: [PATCH] Lets always write out a Legacy grub config file since its
Dennis Gilmore 4921ca
 all ec2     supports and its presence doesnt hurt
Dennis Gilmore 9aba84
Dennis Gilmore 4921ca
    Signed-off-by: Dennis Gilmore <dennis@ausil.us>
Dennis Gilmore 9aba84
---
Dennis Gilmore 9aba84
 appcreate/appliance.py |    6 +++++-
Dennis Gilmore 9aba84
 1 file changed, 5 insertions(+), 1 deletion(-)
Dennis Gilmore 9aba84
Dennis Gilmore 9aba84
diff --git a/appcreate/appliance.py b/appcreate/appliance.py
Dennis Gilmore 4921ca
index f9fc784..d896d34 100644
Dennis Gilmore 9aba84
--- a/appcreate/appliance.py
Dennis Gilmore 9aba84
+++ b/appcreate/appliance.py
Dennis Gilmore 9aba84
@@ -258,6 +258,8 @@ class ApplianceImageCreator(ImageCreator):
Dennis Gilmore 9aba84
             grub += "        initrd %s/%s-%s.img\n" % (prefix, initrd, v)
Dennis Gilmore 9aba84
 
Dennis Gilmore 9aba84
         logging.debug("Writing grub config %s/boot/grub/grub.conf" % self._instroot)
Dennis Gilmore 9aba84
+        if not os.path.isdir(self._instroot + "/boot/grub/"):
Dennis Gilmore 9aba84
+            os.mkdir(self._instroot + "/boot/grub/")
Dennis Gilmore 9aba84
         cfg = open(self._instroot + "/boot/grub/grub.conf", "w")
Dennis Gilmore 9aba84
         cfg.write(grub)
Dennis Gilmore 9aba84
         cfg.close()
Dennis Gilmore 9aba84
@@ -359,6 +361,9 @@ class ApplianceImageCreator(ImageCreator):
Dennis Gilmore 9aba84
         logging.debug("Grub2 configuration file generated.")
Dennis Gilmore 9aba84
 
Dennis Gilmore 9aba84
     def _create_bootconfig(self):
Dennis Gilmore 4921ca
+        # For EC2 lets always make a grub Legacy config file
Dennis Gilmore 4921ca
+        logging.debug("Writing GRUB Legacy config.")
Dennis Gilmore 4921ca
+        self._create_grub_config()
Dennis Gilmore 9aba84
         if self.grub == 'grub2':
Dennis Gilmore 9aba84
             # We have GRUB2 package installed
Dennis Gilmore 9aba84
             # Most probably this is Fedora 16+
Dennis Gilmore 9aba84
@@ -369,7 +374,6 @@ class ApplianceImageCreator(ImageCreator):
Dennis Gilmore 9aba84
             # We have GRUB Legacy installed
Dennis Gilmore 9aba84
             logging.debug("Found GRUB Legacy package.")
Dennis Gilmore 9aba84
             self._create_grub_devices()
Dennis Gilmore 9aba84
-            self._create_grub_config()
Dennis Gilmore 9aba84
             self._copy_grub_files()
Dennis Gilmore 9aba84
             self._install_grub()
Dennis Gilmore 9aba84
         else:
Dennis Gilmore 9aba84
-- 
Dennis Gilmore 9aba84
1.7.9.3
Dennis Gilmore 9aba84