Changeset 2878 in MondoRescue

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

Files:

• mindi/rootfs/sbin/find-and-mount-cdrom (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (2 diffs)
• mindi/rootfs/sbin/install-additional-tools (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (2 diffs)
• mondo/src/common/libmondo-verify.c (modified) (3 diffs)
• mondo/src/common/newt-specific.c (modified) (2 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (6 diffs)

branches/2.2.9/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -34 +34 @@
         fi
         LogIt "$device has a CD-ROM in it"
-        umount /mnt/cdrom
+        umount -d /mnt/cdrom
         ln -sf $device /dev/cdrom
         if [ "$?" -ne "0" ]; then

branches/2.2.9/mindi/rootfs/sbin/init

@@ -825 +825 @@
 ConfigureLoggingDaemons
 if [ -e "/tmp/USE-DEVFS" ] ; then
-    umount /mnt/cdrom 2> /dev/null
+    umount -d /mnt/cdrom 2> /dev/null
     mv /dev/cdrom /cdrom.lnk 2> /dev/null
     CD_MOUNTED_OK=""
@@ -963 +963 @@
 else
     echo -en "Type 'exit' to reboot the PC\n"
-    umount /mnt/cdrom 2> /dev/null
+    umount -d /mnt/cdrom 2> /dev/null
     mount / -o rw,remount > /dev/null 2> /dev/null
     LogIt "Launching Shell"

branches/2.2.9/mindi/rootfs/sbin/install-additional-tools

@@ -58 +58 @@
     cd $old_pwd
     echo -e -n "\r"
-    [ ! -e "/tmp/CDROM-LIVES-HERE" ] && umount $mountpoint
+    [ ! -e "/tmp/CDROM-LIVES-HERE" ] && umount -d $mountpoint
     sleep 1
 fi

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);

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);