Changeset 2847 in MondoRescue for branches/2.2.9/mondo/src/mondorestore

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)

Location:

branches/2.2.9/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore.c (modified) (1 diff)

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

@@ -701 +701 @@
         mr_asprintf(&(bkpinfo->netfs_proto), "nfs");
     }
+    if (read_cfg_var(cfg_file, "netfs-server-user", value) == 0) {
+        mr_asprintf(&(bkpinfo->netfs_user),"%s", value);
+    }
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
             strcpy(bkpinfo->prefix,value);
@@ -868 +871 @@
         log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
         log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
+        if (bkpinfo->netfs_user) {
+            log_msg(2, "netfs_user is %s", bkpinfo->netfs_user);
+        }
         log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
     }

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -3129 +3129 @@
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    sprintf(tmp, "sshfs -o ro %s /tmp/isodir",
-                        bkpinfo->netfs_mount);
+                    if (bkpinfo->netfs_user) {
+                        sprintf(tmp, "sshfs -o ro %s@%s /tmp/isodir",
+                            bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                    } else {
+                        sprintf(tmp, "sshfs -o ro %s /tmp/isodir",
+                            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);
+                    }
                 }
                 run_program_and_log_output(tmp, 1);