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

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)

File:

• branches/2.2.9/mondo/src/mondorestore/mondorestore.c (modified) (1 diff)

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