Changeset 2404 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Sep 17, 2009, 2:23:18 AM (15 years ago)

Author:

Bruno Cornec

Message:

• At restore time read the netfs protocol in the conf file
• Use dir for shell related commands and dir1 for C related actions in open_and_list_dir to avoid missing some files with { in names e.g.

(Backports from 2.2.9)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -749 +749 @@
         bkpinfo->backup_media_type = netfs;
         bkpinfo->please_dont_eject = TRUE;
+        mr_free(value);
+
+        mr_free(bkpinfo->netfs_proto);
+        if ((value = read_cfg_var(cfg_file, "netfs-proto")) == 0) {
+            mr_asprintf(bkpinfo->netfs_proto, "%s", value);
+        } else {
+            /* For compatibility, force protocol in old nfs case to be transparent */
+            mr_asprintf(bkpinfo->netfs_proto, "nfs");
+        }
+        mr_free(value);
+
         mr_free(bkpinfo->prefix);
-        mr_free(value);
         if ((value = read_cfg_var(cfg_file, "iso-prefix")) == 0) {
             mr_asprintf(bkpinfo->prefix, "%s", value);
@@ -756 +766 @@
             mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
         }
+        mr_free(value);
     
         tmp = call_program_and_get_last_line_of_output("cat " CMDLINE);
@@ -769 +780 @@
         }
         mr_free(tmp);
-    /* For compatibility, force protocol in old nfs case to be transparent */
-    if (!strcmp(value, "nfs")) {
-        mr_free(bkpinfo->netfs_proto);
-        mr_asprintf(bkpinfo->netfs_proto, "nfs");
-    }
 
     } else if (!strcmp(value, "tape")) {