Changeset 3111 in MondoRescue for branches/3.0/mondo

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 !!

Location:

branches/3.0/mondo

Files:

• src/common/libmondo-cli.c (modified) (2 diffs)
• src/common/libmondo-devices.c (modified) (4 diffs)
• src/mondorestore/mondorestore.c (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/test-mr_stresc.c (added)

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

@@ -536 +536 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     sprintf(tmp, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     sprintf(tmp, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
@@ -545 +547 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     sprintf(tmp, "mount %s", bkpinfo->netfs_mount);

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)) {

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -3134 +3134 @@
                             bkpinfo->netfs_mount);
                     }
-                } else {
-                    if (bkpinfo->netfs_user) {
-                        sprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir",
-                            bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                } else  {
+                    if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                        if (bkpinfo->netfs_user) {
+                            sprintf(tmp, "mount -t cifs %s /tmp/isodir -o user=%s,nolock,ro ",
+                                bkpinfo->netfs_mount,bkpinfo->netfs_user);
+                        } else {
+                            sprintf(tmp, "mount -t cifs %s /tmp/isodir -o nolock,ro ",
+                                bkpinfo->netfs_mount);
+                        }
                     } else {
-                        sprintf(tmp, "mount %s -o nolock,ro /tmp/isodir",
-                            bkpinfo->netfs_mount);
+                        if (bkpinfo->netfs_user) {
+                            sprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir",
+                                bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                        } else {
+                            sprintf(tmp, "mount %s -o nolock,ro /tmp/isodir",
+                                bkpinfo->netfs_mount);
+                        }
                     }
                 }

branches/3.0/mondo/test/Makefile.am

@@ -2 +2 @@
 
 ## The program
-sbin_PROGRAMS         = mrtest_mountlist mrtest_truncname
+sbin_PROGRAMS         = mrtest_mountlist mrtest_truncname mrtest_stresc
 mrtest_mountlist_SOURCES  = test-mountlist.c ${top_builddir}/src/mondorestore/mondo-prep.c ${top_builddir}/src/mondorestore/mondo-rstr-newt.c ${top_builddir}/src/mondorestore/mondo-rstr-tools.c
 mrtest_mountlist_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
 mrtest_truncname_SOURCES  = test-truncname.c ${top_builddir}/src/common/libmondo-string.c
 mrtest_truncname_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
+mrtest_stresc_SOURCES     = test-mr_stresc.c
+mrtest_stresc_LDADD       = ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@