Changeset 2847 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-cli.c

Timestamp:

Jul 5, 2011, 3:26:49 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Try to handle netfs_user better in all cases (NFS and SSHFS)

File:

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

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

@@ -531 +531 @@
         if (strlen(bkpinfo->isodir) < 3) {
             log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
-            if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
-            } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                sprintf(tmp, "mount %s", bkpinfo->netfs_mount);
+            if (bkpinfo->netfs_user) {
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    sprintf(tmp, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
+                    sprintf(tmp, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                } else {
+                    log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
+                    fatal_error("Bad Protocol\n");
+                }
             } else {
-                log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
-                fatal_error("Bad Protocol\n");
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
+                    sprintf(tmp, "mount %s", bkpinfo->netfs_mount);
+                } else {
+                    log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
+                    fatal_error("Bad Protocol\n");
+                }
             }
             if (system(tmp)) {
@@ -543 +554 @@
                 retval++;
             } else {
-                sprintf(tmp, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
-                    bkpinfo->netfs_mount);
+                if (bkpinfo->netfs_user) {
+                    sprintf(tmp, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
+                        bkpinfo->netfs_mount);
+                } else {
+                    sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
+                }
                 strncpy(bkpinfo->isodir,
                         call_program_and_get_last_line_of_output(tmp),