Upstream release 006.
This commit is contained in:
parent
2dbd06e476
commit
1c89539520
|
@ -1,38 +0,0 @@
|
|||
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()
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
Summary: Tools for building Appliances
|
||||
Name: appliance-tools
|
||||
Version: 005
|
||||
Release: 1.nogrubhack.2%{?dist}
|
||||
Version: 006
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
URL: http://thincrust.org/
|
||||
|
@ -16,7 +16,6 @@ URL: http://thincrust.org/
|
|||
# git checkout appliance-tools-005
|
||||
# make dist
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Patch0: appliance-tools-005-nogrub-hack.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
Requires: livecd-tools >= 020 curl rsync kpartx
|
||||
Requires: zlib
|
||||
|
@ -41,7 +40,6 @@ Tool that helps remove unwanted files from the appliance image.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
make
|
||||
|
@ -75,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_bindir}/image-minimizer
|
||||
|
||||
%changelog
|
||||
* Fri Nov 11 2011 Marek Goldmann <mgoldman@redhat.com> - 006-1
|
||||
- Support for GRUB2 rhbz#744390
|
||||
- Align partitions by default
|
||||
- Search for grub files also in ARCH-unknown directories
|
||||
- Allow to build appliances without GRUB installed at all
|
||||
|
||||
* Sat Oct 29 2011 Dennis Gilmore <dennis@ausil.us> - 005-1.nogrubhack.2
|
||||
- update hack to work around no grub being installed so we can compose ec2 images
|
||||
|
||||
|
|
Loading…
Reference in New Issue