Changeset 3546 in MondoRescue for branches

Timestamp:

Apr 4, 2016, 3:40:24 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Call sync before umounting FS to avoid graphical tools from preventing it to succeed

File:

• branches/3.2/mindi/mindi (modified) (10 diffs)

branches/3.2/mindi/mindi

@@ -235 +235 @@
 
 AbortHere() {
-    [ "$mountpoint" ] && umount $mountpoint 2>> $LOGFILE
+    [ "$mountpoint" ] && sync && umount $mountpoint 2>> $LOGFILE
     Die "Program is terminating in response to signal received from OS/user"
 }
@@ -284 +284 @@
             [ "$sss" = "" ] && sss=`grep -F "$included_item" $MINDI_TMP/keymaps.find`
             for ii in $sss ; do
-                    [ -e "$ii" ] && AddKeyboardMappingFile $ii
+                [ -e "$ii" ] && AddKeyboardMappingFile $ii
             done
         else
@@ -1622 +1622 @@
     LogFile "--------------------------------"
     echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n" >> $LOGFILE
+    sync
     umount $MINDI_TMP/target
     LogAll "ERROR: Problems while creating boot media."
@@ -1641 +1642 @@
     # Some distro do auto mount at that point (Ubuntu)
     LogAll "INFO: Unmounting $USBPART just in case"
+    sync
     umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
     if [ "$BOOT_TYPE" = "BIOS" ]; then
@@ -1690 +1692 @@
     # Some distro do auto mount at that point (Ubuntu)
     LogAll "INFO: Unmounting $USBPART just in case again"
+    sync
     umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
     # Some distro have a dmsetup conf at that point so removing it Cf: http://trac.mondorescue.org/ticket/651
@@ -1749 +1752 @@
     du -sk $MINDI_TMP/mpt/* >> $LOGFILE
     LogFile "--------------------------------"
+    sync
     umount $MINDI_TMP/mpt
     LogAll "ERROR: Problems while creating boot media."
@@ -1778 +1782 @@
 fi
 
+# Avoids graphical tool to keep the FS mounted
+sync
 umount $MINDI_TMP/mpt || Die "Unable to unmount $MINDI_TMP/mpt"
 
@@ -1790 +1796 @@
         # We need the boot image now and what mindi needs at restore time as well
         cp -a $MINDI_TMP/mpt2/images/all.tar.gz $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt/images
+        # Avoids graphical tool to keep the FS mounted
+        sync
         umount $MINDI_TMP/mpt2
         LogFile "----------- target dir content -----------"
@@ -2920 +2928 @@
         (cd "$mountpoint" && ln -sf usr/sbin/init linuxrc)
         # unmount loop filesystem and create image file using the standard approach
+        sync
         umount $mountpoint || Die "Cannot unmount $tempfile"
         dd if=$tempfile bs=1k of=${rdz_fname}.tmp > /dev/null 2> /dev/null
@@ -2940 +2949 @@
         # create cpio image file and unmount loop filesystem
         (cd "$mountpoint" ; find . -print | cpio -o -H newc 2> /dev/null | gzip -9 > $rdz_fname)
+        sync
         umount $mountpoint || Die "Cannot unmount $tempfile"
         # log that we are done