Changeset 2878 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-verify.c

Timestamp:

Oct 5, 2011, 1:20:58 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Uses the -d option of the mount command to avoid leaving loop devices in use. Probably provoked by the usage of a more recent busybox, but anyway that option doesn't hurt, and does nothing for non-loop devices. Should fix the problems reported on the ML with NFS and more than 8 ISO images (8 being the default number of loop devices available)

File:

• branches/2.2.9/mondo/src/common/libmondo-verify.c (modified) (3 diffs)

branches/2.2.9/mondo/src/common/libmondo-verify.c

@@ -1026 +1026 @@
     verify_all_slices_on_CD(mountpoint);
 
-    mr_asprintf(&tmp1, "umount %s", mountpoint);
+    mr_asprintf(&tmp1, "umount -d %s", mountpoint);
 #ifdef __FreeBSD__
     ret += system(tmp1);
@@ -1150 +1150 @@
 #ifdef __FreeBSD__
     ret = 0;
-    sprintf(command, "umount %s", mountpoint);
+    sprintf(command, "umount -d %s", mountpoint);
     ret += system(command);
     ret += kick_vn(mddevice);
     if (ret)
 #else
-    sprintf(command, "umount %s", mountpoint);
+    sprintf(command, "umount -d %s", mountpoint);
     if (system(command))
 #endif
@@ -1166 +1166 @@
     }
     if (!does_file_exist(fname)) {
-        sprintf(command, "umount %s", bkpinfo->media_device);
+        sprintf(command, "umount -d %s", bkpinfo->media_device);
         run_program_and_log_output(command, 2);
         if (!bkpinfo->please_dont_eject