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

Timestamp:

May 5, 2013, 4:55:42 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert patch 3106-2107 from SVK which had removed good code and fixes !!

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;
@@ -2528 +2529 @@
         strcpy(tmp1, bkpinfo->netfs_proto);
         if (!popup_and_get_string
-            ("Network protocol", "Which protocol should I use (nfs/sshfs) ?",
+            ("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",
              tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
@@ -2567 +2568 @@
             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");
+            } 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);
+                }
+            else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(&tmp, "sshfs -o ro");
+                    mr_asprintf(&tmp, "sshfs %s ",tmpro);
                 } else {
-                    mr_asprintf(&tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto);
+                    mr_asprintf(&tmp, "mount -t %s -o nolock %s ", bkpinfo->netfs_proto,tmpro);
                 }
-            } else {
-                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(&tmp, "sshfs");
-                } else {
-                    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, " ");
-            if (bkpinfo->netfs_user) {
-                mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
-            }
-            mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+            }
             run_program_and_log_output(tmp, 3);
             mr_free(tmp);
@@ -2590 +2598 @@
             malloc_string(g_selfmounted_isodir);
             strcpy(g_selfmounted_isodir, bkpinfo->isodir);
+            }
         }
         if (!is_this_device_mounted(bkpinfo->netfs_mount)) {