Changeset 2382 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondorestore.c

Timestamp:

Sep 10, 2009, 2:07:16 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Change NFS support into a NetFS support to allow for multiple protocol in addition to NFS (NEEDS TESTING)

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/mondorestore/mondorestore.c (modified) (4 diffs)

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -919 +919 @@
     mr_free(bkpinfo->restore_path);
     mr_asprintf(bkpinfo->restore_path, "/");
-    if (!g_restoring_live_from_cd && !g_restoring_live_from_nfs) {
+    if (!g_restoring_live_from_cd && !g_restoring_live_from_netfs) {
         popup_and_OK
             ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
         sleep(1);
     }
-    if (!g_restoring_live_from_nfs) {
+    if (!g_restoring_live_from_netfs) {
         interactively_obtain_media_parameters_from_user(FALSE);
     }
@@ -946 +946 @@
     load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
 
-    if (!g_restoring_live_from_nfs && (filelist = process_filelist_and_biggielist())) {
+    if (!g_restoring_live_from_netfs && (filelist = process_filelist_and_biggielist())) {
         save_filelist(filelist, "/tmp/selected-files.txt");
         mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
@@ -2828 +2828 @@
         mount_boot_if_necessary();  /* for Gentoo users */
         log_msg(2, "Still here.");
-        if (bkpinfo->backup_media_type == nfs) {
-            g_restoring_live_from_nfs = TRUE;
+        if (bkpinfo->backup_media_type == netfs) {
+            g_restoring_live_from_netfs = TRUE;
         }
         /* Adding an initialisation in order to avoid to hndle NULL pointer later */
@@ -2861 +2861 @@
         // BCO:To be reviewed
         if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
-            if (bkpinfo->backup_media_type == nfs && bkpinfo->nfs_mount && !is_this_device_mounted(bkpinfo->nfs_mount)) {
-                log_msg(1, "Mounting nfs dir");
+            if (bkpinfo->backup_media_type == netfs && bkpinfo->netfs_mount && !is_this_device_mounted(bkpinfo->netfs_mount)) {
+                log_msg(1, "Mounting remote %s dir", bkpinfo->netfs_proto);
                 mr_free(bkpinfo->isodir);
                 mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-                mr_asprintf(tmp, "mount %s -t nfs -o nolock,ro /tmp/isodir", bkpinfo->nfs_mount);
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    mr_asprintf(tmp, "sshfs -o ro %s /tmp/isodir", bkpinfo->netfs_mount);
+                } else {
+                    mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                }
                 run_program_and_log_output(tmp, 1);
                 mr_free(tmp);