[appliance-tools/f16] update hack to work around no grub being installed so we can compose ec2 images
Dennis Gilmore
ausil at fedoraproject.org
Sat Oct 29 14:17:37 UTC 2011
commit 2dbd06e476907714f1b2fac45e0512aa019da39b
Author: Dennis Gilmore <dennis at ausil.us>
Date: Sat Oct 29 09:17:04 2011 -0500
update hack to work around no grub being installed so we can compose ec2 images
appliance-tools-005-nogrub-hack.patch | 21 ++++++++++++++++++++-
appliance-tools.spec | 7 +++++--
2 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/appliance-tools-005-nogrub-hack.patch b/appliance-tools-005-nogrub-hack.patch
index f9fa5ec..5b68543 100644
--- a/appliance-tools-005-nogrub-hack.patch
+++ b/appliance-tools-005-nogrub-hack.patch
@@ -1,6 +1,6 @@
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 08:19:04.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
@@ -17,3 +17,22 @@ diff -uNr appliance-tools-005-orig/appcreate/appliance.py appliance-tools-005/ap
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()
diff --git a/appliance-tools.spec b/appliance-tools.spec
index a1224d1..1a3bb13 100644
--- a/appliance-tools.spec
+++ b/appliance-tools.spec
@@ -5,7 +5,7 @@
Summary: Tools for building Appliances
Name: appliance-tools
Version: 005
-Release: 1.nogrubhack%{?dist}
+Release: 1.nogrubhack.2%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://thincrust.org/
@@ -75,7 +75,10 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/image-minimizer
%changelog
-* Sat Oct 29 2011 Dennis Gilmore <dennis at ausil.us> - 005-2
+* Sat Oct 29 2011 Dennis Gilmore <dennis at ausil.us> - 005-1.nogrubhack.2
+- update hack to work around no grub being installed so we can compose ec2 images
+
+* Sat Oct 29 2011 Dennis Gilmore <dennis at ausil.us> - 005-1.nogrubhack
- add a hack to work around no grub being installed so we can compose ec2 images
* Mon Apr 04 2011 Alan Pevec <apevec at redhat.com> 005-1
More information about the scm-commits
mailing list