Changeset 2878 in MondoRescue for branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.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/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -304 +304 @@
     return (1);
 }
-paranoid_system("umount " MNT_CDROM " 2> /dev/null");   /* just in case */
+paranoid_system("umount -d " MNT_CDROM " 2> /dev/null");    /* just in case */
 
 if (is_this_device_mounted(g_isodir_device)) {
@@ -681 +681 @@
         if (does_file_exist(MNT_CDROM "/archives/filelist.0")) {
             bkpinfo->backup_media_type = cdr;
-            run_program_and_log_output("umount " MNT_CDROM, 1);
+            run_program_and_log_output("umount -d " MNT_CDROM, 1);
             log_it
                 ("Re-jigging configuration AGAIN. CD-R, not ISO.");
@@ -2254 +2254 @@
         }
     }
-    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
     if (!does_file_exist(cfg_file)) {
         log_it("%s",cfg_file);