diff --git a/0001-Lets-always-write-out-a-Legacy-grub-config-file-sinc.patch b/0001-Lets-always-write-out-a-Legacy-grub-config-file-sinc.patch new file mode 100644 index 0000000..5b0a08c --- /dev/null +++ b/0001-Lets-always-write-out-a-Legacy-grub-config-file-sinc.patch @@ -0,0 +1,45 @@ +From 9a7726c67258adb346b78edfd754f28e132585f5 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Tue, 13 Mar 2012 12:03:24 -0500 +Subject: [PATCH] Lets always write out a Legacy grub config file since its + all ec2 supports and its presence doesnt hurt + +Signed-off-by: Dennis Gilmore +--- + appcreate/appliance.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/appcreate/appliance.py b/appcreate/appliance.py +index f9fc784..12f6794 100644 +--- a/appcreate/appliance.py ++++ b/appcreate/appliance.py +@@ -258,6 +258,8 @@ class ApplianceImageCreator(ImageCreator): + grub += " initrd %s/%s-%s.img\n" % (prefix, initrd, v) + + logging.debug("Writing grub config %s/boot/grub/grub.conf" % self._instroot) ++ if not os.path.isdir(self._instroot + "/boot/grub/"): ++ os.mkdir(self._instroot + "/boot/grub/") + cfg = open(self._instroot + "/boot/grub/grub.conf", "w") + cfg.write(grub) + cfg.close() +@@ -359,6 +361,9 @@ class ApplianceImageCreator(ImageCreator): + logging.debug("Grub2 configuration file generated.") + + def _create_bootconfig(self): ++ # For EC2 lets always make a grub Legacy config file ++ logging.debug("Writing GRUB Legacy config.") ++ self._create_grub_config() + if self.grub == 'grub2': + # We have GRUB2 package installed + # Most probably this is Fedora 16+ +@@ -369,7 +374,6 @@ class ApplianceImageCreator(ImageCreator): + # We have GRUB Legacy installed + logging.debug("Found GRUB Legacy package.") + self._create_grub_devices() +- self._create_grub_config() + self._copy_grub_files() + self._install_grub() + else: +-- +1.7.9.3 + diff --git a/appliance-tools.spec b/appliance-tools.spec index bb1ffc0..1aabac7 100644 --- a/appliance-tools.spec +++ b/appliance-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building Appliances Name: appliance-tools Version: 006.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base URL: http://thincrust.org/ @@ -16,6 +16,7 @@ URL: http://thincrust.org/ # git checkout appliance-tools-006.1 # make dist Source0: %{name}-%{version}.tar.bz2 +Patch0: 0001-Lets-always-write-out-a-Legacy-grub-config-file-sinc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: livecd-tools >= 020 curl rsync kpartx Requires: zlib @@ -40,6 +41,7 @@ Tool that helps remove unwanted files from the appliance image. %prep %setup -q +%patch0 -p1 %build make @@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/image-minimizer %changelog +* Tue Feb 13 2012 Dennis Gilmore - 006.1-3 +- add patch to always write out a legacy grub config file + * Thu Jan 12 2012 Fedora Release Engineering - 006.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild