Changeset 2847 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.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-devices.c (modified) (4 diffs)

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

@@ -2170 +2170 @@
     char *tmp1 = NULL;
     char *mds = NULL;
+    char *q = NULL;
     char p[8*MAX_STR_LEN];
     char *sz_size;
@@ -2475 +2476 @@
             if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
                 bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
+            q = strchr(bkpinfo->netfs_mount, '@');
+            if (q != NULL) {
+                /* User found. Store the 2 values */
+                q++;
+                /* new netfs mount */
+                strcpy(tmp,q);
+            } else {
+                strcpy(tmp,bkpinfo->netfs_mount);
+            }
             sprintf(command, "mount | grep \"%s \" | cut -d' ' -f3",
-                    bkpinfo->netfs_mount);
+                    tmp);
             strcpy(bkpinfo->isodir,
                    call_program_and_get_last_line_of_output(command));
@@ -2523 +2533 @@
         }
 
+        if (bkpinfo->netfs_user) {
+            strcpy(tmp1, bkpinfo->netfs_user);
+        } else {
+            strcpy(tmp1, "");
+        }
+        if (!popup_and_get_string
+            ("Network user", "Which user should I use if any ?",
+             tmp1, MAX_STR_LEN)) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->netfs_user);
+        if (strcmp(tmp1, "") != 0) {
+            mr_asprintf(&(bkpinfo->netfs_user), "%s", tmp1);
+        }
+    
         /* Initiate bkpinfo isodir path from running environment if mount already done */
         if (is_this_device_mounted(bkpinfo->netfs_mount)) {
@@ -2534 +2560 @@
             if (bkpinfo->restore_data) {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(&tmp, "sshfs -o ro %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                    mr_asprintf(&tmp, "sshfs -o ro");
                 } else {
-                    mr_asprintf(&tmp, "mount -t %s -o nolock,ro %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
+                    mr_asprintf(&tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto);
                 }
             } else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(&tmp, "sshfs %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                    mr_asprintf(&tmp, "sshfs");
                 } else {
-                    mr_asprintf(&tmp, "mount -t %s -o nolock %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
+                    mr_asprintf(&tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto);
                 }
             }
+            if (bkpinfo->netfs_user) {
+                mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
+            }
+            mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
             run_program_and_log_output(tmp, 3);
             mr_free(tmp);