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

Timestamp:

Oct 5, 2011, 1:20:58 AM (14 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/mondorestore

Files:

• mondo-rstr-tools.c (modified) (3 diffs)
• mondorestore.c (modified) (6 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);

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -278 +278 @@
         popup_and_OK("No restoring or comparing will take place today.");
         if (is_this_device_mounted("/mnt/cdrom")) {
-            run_program_and_log_output("umount /mnt/cdrom", FALSE);
+            run_program_and_log_output("umount -d /mnt/cdrom", FALSE);
         }
         if (g_ISO_restore_mode) {
-            sprintf(tmp, "umount %s", bkpinfo->isodir);
+            sprintf(tmp, "umount -d %s", bkpinfo->isodir);
             run_program_and_log_output(tmp, FALSE);
         }
@@ -730 +730 @@
     }
     if (is_this_device_mounted(MNT_CDROM)) {
-        paranoid_system("umount " MNT_CDROM);
+        paranoid_system("umount -d " MNT_CDROM);
     }
 //  if (! already_mounted)
 //    {
-    if (system("umount /tmp/isodir 2> /dev/null")) {
+    if (system("umount -d /tmp/isodir 2> /dev/null")) {
         log_to_screen
             ("WARNING - unable to unmount device where the ISO files are stored.");
@@ -1012 +1012 @@
                 "Tape : I don't need to unmount or eject the CD-ROM.");
     } else {
-        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (!bkpinfo->please_dont_eject) {
             eject_device(bkpinfo->media_device);
         }
     }
-    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
     if (!bkpinfo->please_dont_eject) {
         eject_device(bkpinfo->media_device);
@@ -2914 +2914 @@
     make_hole_for_dir("/var/log");
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
-    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
     /*
     run_program_and_log_output("ln -sf /var/log/mondo-archive.log /tmp/mondorestore.log",
@@ -3205 +3205 @@
             run_program_and_log_output("sync", FALSE);
             if (is_this_device_mounted(MNT_CDROM)) {
-                run_program_and_log_output("umount " MNT_CDROM, FALSE);
+                run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
             }
 
@@ -3265 +3265 @@
             retval);
     log_to_screen(tmp);
-    sprintf(tmp, "umount %s", bkpinfo->isodir);
+    sprintf(tmp, "umount -d %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
     paranoid_free(mountlist);