From 000108573470503cad4447b8f5c8bd026712dd5f Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Sat, 22 Mar 2008 23:46:30 +0000
Subject: [PATCH] sysconf: make sure temporary partition is unmounted even in
 event of error.

---
 packages/slugos-init/files/sysconf      | 4 ++++
 packages/slugos-init/slugos-init_4.8.bb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf
index 84a14af550..57a69b7643 100644
--- a/packages/slugos-init/files/sysconf
+++ b/packages/slugos-init/files/sysconf
@@ -665,6 +665,8 @@ sysconf_restore(){
 			#
 			mkdir "$saved" || {
 				sysconf_restore_error "$ffsdir" "$saved: failed to create temporary directory"
+				umount "$ffsdir" && rmdir "$ffsdir" ||
+					echo "$0: $ffsdir: temporary directory cleanup failed" >&2
 				return 1
 			}
 			#
@@ -678,6 +680,8 @@ sysconf_restore(){
 			) || {
 				rm -rf "$saved"
 				sysconf_restore_error "$ffsdir" "$saved: cpio -i failed"
+				umount "$ffsdir" && rmdir "$ffsdir" ||
+					echo "$0: $ffsdir: temporary directory cleanup failed" >&2
 				return 1
 			}
 			# either there must be no 'diff' files or it must
diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb
index 4babf89d61..ebb6ff7744 100644
--- a/packages/slugos-init/slugos-init_4.8.bb
+++ b/packages/slugos-init/slugos-init_4.8.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
-- 
2.39.5