From d4c3563e2bce4a2036d958d30fafa5cddb4c4da4 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <greg@kroah.com>
Date: Thu, 18 Jul 2013 23:13:40 -0700
Subject: [PATCH] fix(coreos-base/bootengine) bump to latest git and fix umount
 to be recursive

Also make mkdir be "nice" if the directory is already there and not spit
out a warning message.
---
 ...0.0.1-r6.ebuild => bootengine-0.0.1-r7.ebuild} |  0
 .../bootengine/bootengine-0.0.1.ebuild            | 13 ++++++-------
 .../coreos-base/bootengine/bootengine-9999.ebuild | 15 +++++++--------
 3 files changed, 13 insertions(+), 15 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/{bootengine-0.0.1-r6.ebuild => bootengine-0.0.1-r7.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r7.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r6.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r7.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild
index 47c70fc2cd..8395741a0f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-CROS_WORKON_COMMIT="23bf5d73f71886743cee0c05f6f9f707877b9883"
+CROS_WORKON_COMMIT="226fa7710b9439a236574f4cd5baa71f56d649f7"
 CROS_WORKON_PROJECT="coreos/bootengine"
 CROS_WORKON_LOCALNAME="bootengine"
 CROS_WORKON_OUTOFTREE_BUILD=1
@@ -40,17 +40,16 @@ pkg_postinst() {
 	# need to figure out how to remove someday.
 	chroot ${ROOT} dracut --host-only --force --no-kernel --fstab --no-compress /tmp/bootengine.cpio
 
-	umount ${ROOT}/proc
-	umount ${ROOT}/dev/pts	# trust me, it's there, unmount it.
-	umount ${ROOT}/dev
-	umount ${ROOT}/sys
-	umount ${ROOT}/run
+	umount --recursive ${ROOT}/proc
+	umount --recursive ${ROOT}/dev
+	umount --recursive ${ROOT}/sys
+	umount --recursive ${ROOT}/run
 
 	# as we are not in src_install() insinto and doins do not work here, so
 	# manually copy the file around
 	cpio=${ROOT}/tmp/bootengine.cpio
 	chmod 644 ${cpio} || die
-	mkdir ${ROOT}/usr/share/bootengine/
+	mkdir -p ${ROOT}/usr/share/bootengine/
 	cp ${cpio} ${ROOT}/usr/share/bootengine/ || die
 	rm ${cpio}
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild
index 562af349d2..32616472c6 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild
@@ -39,17 +39,16 @@ pkg_postinst() {
 	# need to figure out how to remove someday.
 	chroot ${ROOT} dracut --host-only --force --no-kernel --fstab --no-compress /tmp/bootengine.cpio
 
-	umount ${ROOT}/proc
-	umount ${ROOT}/dev/pts	# trust me, it's there, unmount it.
-	umount ${ROOT}/dev
-	umount ${ROOT}/sys
-	umount ${ROOT}/run
+	umount --recursive ${ROOT}/proc
+	umount --recursive ${ROOT}/dev
+	umount --recursive ${ROOT}/sys
+	umount --recursive ${ROOT}/run
 
 	# as we are not in src_install() insinto and doins do not work here, so
 	# manually copy the file around
 	cpio=${ROOT}/tmp/bootengine.cpio
-	chmod 644 ${cpio}
-	mkdir ${ROOT}/usr/share/bootengine/
-	cp ${cpio} ${ROOT}/usr/share/bootengine/
+	chmod 644 ${cpio} || die
+	mkdir -p ${ROOT}/usr/share/bootengine/
+	cp ${cpio} ${ROOT}/usr/share/bootengine/ || die
 	rm ${cpio}
 }