[oe-commits] org.oe.dev sysconf: make sure temporary partition is unmounted even in event of error.

[mwester commit]

sysconf: make sure temporary partition is unmounted even in event of error.

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 4d3f6129ff74b55c246c109b0515837fb4fcef27
ViewMTN: http://monotone.openembedded.org/revision/info/4d3f6129ff74b55c246c109b0515837fb4fcef27
Files:
1
packages/slugos-init/files/sysconf
packages/slugos-init/slugos-init_4.8.bb
Diffs:

#
# mt diff -r9fac88b60a3e766ca672212487b9959370843d18 -r4d3f6129ff74b55c246c109b0515837fb4fcef27
#
#
#
# patch "packages/slugos-init/files/sysconf"
#  from [4742342792c7cda553ad6d667b8380ec8bca1121]
#    to [7b8a065a170668148dceedebd8ac6828d2e0a966]
# 
# patch "packages/slugos-init/slugos-init_4.8.bb"
#  from [f1d83bb6efd47859e2fa618a8f46c7956a5305a5]
#    to [3cc7d29041e1c5b8ccd51759b5772dd0a44bb8e3]
#
============================================================
--- packages/slugos-init/files/sysconf	4742342792c7cda553ad6d667b8380ec8bca1121
+++ packages/slugos-init/files/sysconf	7b8a065a170668148dceedebd8ac6828d2e0a966
@@ -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
============================================================
--- packages/slugos-init/slugos-init_4.8.bb	f1d83bb6efd47859e2fa618a8f46c7956a5305a5
+++ packages/slugos-init/slugos-init_4.8.bb	3cc7d29041e1c5b8ccd51759b5772dd0a44bb8e3
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \