[diskimage-builder/f20] Rebase to 0.1.5

[Jeff Peeler]

commit 79f1aff11f3a5d19d0c38acbe4668d5ba4a38dc7
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Mon Jan 27 15:12:23 2014 -0500

    Rebase to 0.1.5

 .gitignore                                         |    1 +
 ...ount-root-filesystem-readonly-during-boot.patch |   31 +++++++++
 ...-Set-raw-image-size-to-be-multiple-of-64k.patch |   36 ----------
 0002-Add-package-mapping-for-default-jre.patch     |   25 -------
 ...files-ordering-when-choosing-newest-image.patch |   41 ------------
 ...r-option-from-kpartx-for-successful-build.patch |   29 --------
 ...dora-grub-from-cached-rpm-during-finalise.patch |   70 --------------------
 diskimage-builder.spec                             |    9 ++-
 sources                                            |    2 +-
 9 files changed, 41 insertions(+), 203 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 021e1a5..c548c3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /diskimage-builder-0.0.1-5b37036.tar.gz
 /diskimage-builder-0.0.1.tar.gz
 /diskimage-builder-0.0.5.tar.gz
+/diskimage-builder-0.1.5.tar.gz
diff --git a/0001-Mount-root-filesystem-readonly-during-boot.patch b/0001-Mount-root-filesystem-readonly-during-boot.patch
new file mode 100644
index 0000000..8ce64f6
--- /dev/null
+++ b/0001-Mount-root-filesystem-readonly-during-boot.patch
@@ -0,0 +1,31 @@
+From 2c8d4b227175a472e4bae20d3ccbc3abe5913f81 Mon Sep 17 00:00:00 2001
+From: Derek Higgins <derekh at redhat.com>
+Date: Thu, 23 Jan 2014 15:56:30 +0000
+Subject: [PATCH 1/6] Mount root filesystem readonly during boot
+
+If creating an image of a disto without grub2 extlinux is instead used,
+extlinux was being configured to mount the root filesystem as
+read/write which in turn causes e2fsck to fail to test the filesystem,
+on RHEL 6.5 this causes the boot process to fail.
+
+Change-Id: I07859e0df9a2bc1ddd8c5f2ed4509ba14312e140
+---
+ elements/vm/finalise.d/51-bootloader | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/elements/vm/finalise.d/51-bootloader b/elements/vm/finalise.d/51-bootloader
+index 11fd053..9cd6fad 100755
+--- a/elements/vm/finalise.d/51-bootloader
++++ b/elements/vm/finalise.d/51-bootloader
+@@ -49,7 +49,7 @@ DEFAULT linux
+ 
+ LABEL linux
+   KERNEL $kernel
+-  APPEND rw root=LABEL=cloudimg-rootfs
++  APPEND ro root=LABEL=cloudimg-rootfs
+   INITRD  $initrd
+ _EOF_
+ }
+-- 
+1.8.4.2
+
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index 18d5beb..4fd450e 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,12 +1,14 @@
 Name:		diskimage-builder
 Summary:	Image building tools for OpenStack
-Version:	0.0.5
+Version:	0.1.5
 Release:	1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://launchpad.net/diskimage-builder
 Source0:	http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.gz
 
+Patch0001: 0001-Mount-root-filesystem-readonly-during-boot.patch
+
 BuildArch: noarch
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
@@ -21,6 +23,8 @@ Requires: curl
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0001 -p1
+
 %build
 %{__python} setup.py build
 
@@ -48,6 +52,9 @@ Components of TripleO that are responsible for building disk images.
 %{_datadir}/%{name}/elements
 
 %changelog
+* Mon Jan 27 2014 Jeff Peeler <jpeeler at redhat.com> 0.1.5-1
+- rebase to 0.1.5 + patch to fix RHEL 6.5 boot (rhbz#1057217)
+
 * Wed Oct 9 2013 Jeff Peeler <jpeeler at redhat.com> 0.0.5-1
 - rebase to 0.0.5
 
diff --git a/sources b/sources
index 7b8e64e..727e1c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d6f4c387795d1aa9bc6891646ae70ee  diskimage-builder-0.0.5.tar.gz
+5112f106e88b0eda28f7b0ad02f37799  diskimage-builder-0.1.5.tar.gz