Changeset 1858 in MondoRescue for branches/2.2.5

Timestamp:

Jan 11, 2008, 4:22:14 PM (16 years ago)

Author:

Bruno Cornec

Message:

Try to really fix the NFS mount problem already handled in rev [1849]

File:

• branches/2.2.5/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -2132 +2132 @@
         bkpinfo->please_dont_eject = TRUE;
 
-        /* Initiate bkpinfo paths from running environment if not already done */
+        /* Initiate bkpinfo nfs_mount path from running environment if not already done */
         if (!bkpinfo->nfs_mount[0]) {
             strcpy(bkpinfo->nfs_mount,
                    call_program_and_get_last_line_of_output
                    ("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
-        }
-        if (!bkpinfo->isodir[0]) {
-            strcpy(bkpinfo->isodir,
-                   call_program_and_get_last_line_of_output
-                   ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -2201 +2196 @@
             }
         }
-        if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
+        /* Initiate bkpinfo isodir path from running environment if mount already done */
+        if (is_this_device_mounted(bkpinfo->nfs_mount)) {
+            strcpy(bkpinfo->isodir,
+                   call_program_and_get_last_line_of_output
+                   ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
+        } else {
             sprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
             sprintf(command, "mkdir -p %s", bkpinfo->isodir);