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

diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf
index 84a14af..57a69b7 100644 (file)
--- 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 4babf89..ebb6ff7 100644 (file)
--- 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 \