Changeset 2223 in MondoRescue

Timestamp:

Jun 17, 2009, 3:38:48 AM (16 years ago)

Author:

Bruno Cornec

Message:

mount the NFS dir in mondoarchive, if not already mounted, but present in fstab. Also avoids issue with trailing /. Should fix #304.

File:

• branches/2.2.9/mondo/src/common/libmondo-cli.c (modified) (2 diffs)

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

@@ -988 +988 @@
             strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
         }
-        sprintf(tmp, "mount | grep -E \"^%s .*\" | cut -d' ' -f3",
+        sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
         strncpy(bkpinfo->isodir,
@@ -994 +994 @@
                 MAX_STR_LEN / 4);
         if (strlen(bkpinfo->isodir) < 3) {
-            retval++;
-            log_to_screen("NFS share is not mounted. Please mount it.\n");
+            log_to_screen("NFS share is not mounted. Trying to mount it for you.\n");
+            sprintf(tmp, "mount %s", bkpinfo->nfs_mount);
+            if (system(tmp)) {
+                log_to_screen("Unable to mount NFS share %s. Please mount manually.\n", bkpinfo->nfs_mount);
+                retval++;
+            } else {
+                sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
+                    bkpinfo->nfs_mount);
+                strncpy(bkpinfo->isodir,
+                        call_program_and_get_last_line_of_output(tmp),
+                        MAX_STR_LEN / 4);
+                if (strlen(bkpinfo->isodir) < 3) {
+                    retval++;
+                    log_to_screen("NFS share %s is strangely not mounted. Please mount manually...\n", bkpinfo->nfs_mount);
+                }
+            }
         }
         log_msg(3, "mount = %s", bkpinfo->nfs_mount);