[diskimage-builder] Unset trap before dracut ramdisk build script exits

[slagle]

commit ce2892f3d5877feb1ba747e570cf56e161e84c97
Author: James Slagle <jslagle at redhat.com>
Date:   Thu Oct 23 15:58:50 2014 -0400

    Unset trap before dracut ramdisk build script exits

 ...-before-dracut-ramdisk-build-script-exits.patch |   24 ++++++++++++++++++++
 diskimage-builder.spec                             |    7 +++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0004-Unset-trap-before-dracut-ramdisk-build-script-exits.patch b/0004-Unset-trap-before-dracut-ramdisk-build-script-exits.patch
new file mode 100644
index 0000000..f8cdc95
--- /dev/null
+++ b/0004-Unset-trap-before-dracut-ramdisk-build-script-exits.patch
@@ -0,0 +1,24 @@
+From 4a17ac748f636c9f6f87a27800210eb6f1255e0d Mon Sep 17 00:00:00 2001
+From: Ben Nemec <bnemec at redhat.com>
+Date: Thu, 23 Oct 2014 20:02:08 -0500
+Subject: [PATCH] Unset trap before dracut ramdisk build script exits
+
+A similar change was needed in the normal ramdisk element as part
+of ae928057bd2fc2205c91bf052d5503de64f9ea69 to avoid running
+cleanup immediately after the ramdisk build completes.
+
+Change-Id: Ia96e2d8011b88ed96cc6727914c5a5d2dea59757
+---
+ elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk b/elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk
+index 0c5e3fc..01e7930 100755
+--- a/elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk
++++ b/elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk
+@@ -61,3 +61,5 @@ dracut -N \
+ 
+ cp "/boot/vmlinuz-${KERNEL_VERSION}" /tmp/kernel
+ chmod o+r /tmp/kernel
++# We don't want to run cleanup (set in mk_build_dir above) when this exits
++trap EXIT
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index c69506b..4cd5f47 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,7 +1,7 @@
 Name:		diskimage-builder
 Summary:	Image building tools for OpenStack
 Version:	0.1.34
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://launchpad.net/diskimage-builder
@@ -10,6 +10,7 @@ Source0:	http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.
 Patch0001: 0001-svc-map-requires-PyYAML.patch
 Patch0002: 0002-Enable-dracut-deploy-ramdisks.patch
 Patch0003: 0003-Move-busybox-binary-dep-to-ramdisk-element.patch
+Patch0004: 0004-Unset-trap-before-dracut-ramdisk-build-script-exits.patch
 
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -31,6 +32,7 @@ Requires: dib-utils
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 %build
 %{__python} setup.py build
@@ -71,6 +73,9 @@ Components of TripleO that are responsible for building disk images.
 %{_datadir}/%{name}/elements
 
 %changelog
+* Thu Oct 23 2014 James Slagle <jslagle at redhat.com> 0.1.34-5
+- Unset trap before dracut ramdisk build script exits
+
 * Wed Oct 22 2014 James Slagle <jslagle at redhat.com> 0.1.34-4
 - Move busybox binary-dep to ramdisk element