Changeset 3107 in MondoRescue for branches/3.0/mondo/src/common/libmondo-devices.c

Timestamp:

May 5, 2013, 4:23:30 AM (11 years ago)

Author:

Bruno Cornec

Message:

 

File:

• branches/3.0/mondo/src/common/libmondo-devices.c (modified) (4 diffs)

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

@@ -2174 +2174 @@
 {
     char *tmp = NULL;
-    char *tmpro = NULL;
     char *tmp1 = NULL;
     char *mds = NULL;
@@ -2529 +2528 @@
         strcpy(tmp1, bkpinfo->netfs_proto);
         if (!popup_and_get_string
-            ("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",
+            ("Network protocol", "Which protocol should I use (nfs/sshfs) ?",
              tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
@@ -2568 +2567 @@
             sprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
-
             if (bkpinfo->restore_data) {
-                /*  mount th FS read-only in restore mode to avoid any erase of whatever */
-                mr_asprintf(&tmpro, "-o ro");
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    mr_asprintf(&tmp, "sshfs -o ro");
+                } else {
+                    mr_asprintf(&tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto);
+                }
             } else {
-                mr_asprintf(&tmpro, "");
-            }
-
-            /*  Build the mount string */
-            if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                mr_asprintf(&tmp, "mount -t cifs %s %s %s",bkpinfo->netfs_mount, bkpinfo->isodir,tmpro);
-                if (bkpinfo->netfs_user) {
-                    mr_strcat(tmp, " -o user=%s", bkpinfo->netfs_user);
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    mr_asprintf(&tmp, "sshfs");
+                } else {
+                    mr_asprintf(&tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto);
                 }
-            else {
-                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(&tmp, "sshfs %s ",tmpro);
-                } else {
-                    mr_asprintf(&tmp, "mount -t %s -o nolock %s ", bkpinfo->netfs_proto,tmpro);
-                }
-                if (bkpinfo->netfs_user) {
-                    mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
-                }
-                mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
-            }
+            }
+            mr_strcat(tmp, " ");
+            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);
@@ -2598 +2590 @@
             malloc_string(g_selfmounted_isodir);
             strcpy(g_selfmounted_isodir, bkpinfo->isodir);
-            }
         }
         if (!is_this_device_mounted(bkpinfo->netfs_mount)) {