Changeset 2878 in MondoRescue for branches/2.2.9/mondo/src/common

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)

Location:

branches/2.2.9/mondo/src/common

Files:

• libmondo-devices.c (modified) (2 diffs)
• libmondo-verify.c (modified) (3 diffs)
• newt-specific.c (modified) (2 diffs)

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

@@ -1521 +1521 @@
 
         /* Now we need to umount the current media to have the next mounted after */
-        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         log_msg(3, "Mounting next media %d",cd_number_i_want);
         g_current_media_number = cd_number_i_want;
@@ -1535 +1535 @@
             if (is_this_device_mounted(MNT_CDROM)) {
                 res =
-                    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+                    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
             } else {
                 res = 0;

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

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -349 +349 @@
         chdir("/");
         if (g_selfmounted_isodir) {
-            sprintf(command, "umount %s", g_selfmounted_isodir);
+            sprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
             sprintf(command, "rmdir %s", g_selfmounted_isodir);
@@ -406 +406 @@
 
         chdir("/");
-        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             paranoid_free(command);