Use do_on_exit() in build scripts for cleanup

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 4b81c5cdbc50b596da48371c69296b76054f9884..b8f7092163949962b4b3eb25864b02f39c705baf 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -32,6 +32,9 @@ log_action "Mounting cache to $CACHEDIR"
 mkdir -p $APTCACHE
 execute "mount -o bind $CACHEDIR $APTCACHE"
 
+do_on_exit umount -l $APTCACHE
+do_on_exit umount -l $LOOPDIR
+
 log_action "Running debootstrap ($ROOTFSSUITE, $ROOTFSARCH)"
 execute "debootstrap --arch=$ROOTFSARCH --include=$PACKAGES $ROOTFSSUITE $LOOPDIR $ROOTFSMIRROR"
 
@@ -45,6 +48,3 @@ do
        log_action "Disabling service $service"
        execute_chroot "update-rc.d -f $service remove"
 done
-
-execute "umount -l $APTCACHE" 0
-execute "umount -l $LOOPDIR" 0

diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs
index e5355988cd7db2e14a8afbe42d2be491f7253cfc..b4efc0ecbd50f62197bba89a094dd09041ee6e87 100755 (executable)
--- a/testing/scripts/build-umlhostfs
+++ b/testing/scripts/build-umlhostfs
@@ -36,6 +36,9 @@ else
        HOSTS=$*
 fi
 
+# just to be sure
+do_on_exit umount $LOOPDIR
+
 for host in $HOSTS
 do
        log_action "Creating guest image for $host"
@@ -56,6 +59,6 @@ do
                execute_chroot "chown -R openldap:openldap /var/lib/ldap" 0
        fi
        sync
-       umount $LOOPDIR
        log_status 0
+       umount $LOOPDIR
 done

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 6c67a25342d76bfa2030b10e4fae243335bca29f..a93adac4c0d004e1c8dd1ef69ebba9b25d16c258 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -41,6 +41,10 @@ mkdir -p $LOOPDIR/root/compile
 log_action "Mounting $ROOTFSCOMPILEDIR as /root/compile"
 execute "mount -o bind $ROOTFSCOMPILEDIR $LOOPDIR/root/compile"
 
+do_on_exit umount $LOOPDIR/root/compile
+do_on_exit umount $LOOPDIR/proc
+do_on_exit umount $LOOPDIR
+
 echo "Installing software from source"
 RECPDIR=$UMLTESTDIR/testing/scripts/recipes
 RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename`
@@ -52,8 +56,6 @@ do
        execute_chroot "make SWANVERSION=$SWANVERSION -C /root/compile -f $r"
 done
 
-umount $LOOPDIR/root/compile
-
 log_action "Setting up shared build tree at /root/compile"
 echo "" >> $LOOPDIR/etc/fstab
 echo "none /root/compile hostfs $ROOTFSCOMPILEDIR" >> $LOOPDIR/etc/fstab
@@ -61,6 +63,3 @@ log_status 0
 
 log_action "Removing /etc/resolv.conf"
 execute "rm -f $LOOPDIR/etc/resolv.conf"
-
-execute "umount $LOOPDIR/proc" 0
-execute "umount $LOOPDIR" 0