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

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)

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-rstr-newt.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (8 diffs)
• mondorestore.c (modified) (4 diffs)
• mr-externs.h (modified) (1 diff)

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

@@ -2289 +2289 @@
     }
 
-    if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
+    if (does_file_exist("/tmp/NETFS-SERVER-PATH")) {
         mr_free(idev);
-        idev = last_line_of_file("/tmp/NFS-SERVER-MOUNT");
-        mr_asprintf(isodir_format, "nfs");
+        idev = last_line_of_file("/tmp/NETFS-SERVER-MOUNT");
+        mr_asprintf(isodir_format, "netfs");
         mr_free(isodir_path);
-        isodir_path = last_line_of_file("/tmp/NFS-SERVER-PATH");
+        isodir_path = last_line_of_file("/tmp/NETFS-SERVER-PATH");
     }
 

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

@@ -7 +7 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -562 +563 @@
     }
 
-    if (bkpinfo->backup_media_type == nfs) {
-        log_msg(2, "Mounting for NFS thingy");
+    if (bkpinfo->backup_media_type == netfs) {
+        log_msg(2, "Mounting for Network thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
         if (!strcmp(bkpinfo->isodir, "/") && am_I_in_disaster_recovery_mode()) {
@@ -570 +571 @@
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
-        if ((bkpinfo->isodir == NULL) || (bkpinfo->nfs_remote_dir == NULL) || (bkpinfo->prefix == NULL)) {
+        if ((bkpinfo->isodir == NULL) || (bkpinfo->netfs_remote_dir == NULL) || (bkpinfo->prefix == NULL)) {
             fatal_error("Unable to prepare the iso filename");
         }
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         mr_free(mount_cmd);
@@ -580 +581 @@
         mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
@@ -744 +745 @@
             mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
         }
-    } else if (!strcmp(value, "nfs")) {
-        bkpinfo->backup_media_type = nfs;
+    } else if (!strcmp(value, "netfs")) {
+        bkpinfo->backup_media_type = netfs;
         bkpinfo->please_dont_eject = TRUE;
         mr_free(bkpinfo->prefix);
@@ -757 +758 @@
         if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "pxe")) {
             /* We need to override prefix value in PXE mode as it's 
-            * already done in start-nfs */
+            * already done in start-netfs */
             envtmp1 = getenv("imgname");
             if (envtmp1 == NULL) {
@@ -944 +945 @@
 mr_free(tmp);
 
-if (bkpinfo->backup_media_type == nfs) {
+if (bkpinfo->backup_media_type == netfs) {
     if (!cfgf) {
-        if (bkpinfo->nfs_mount) {
-            log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
-        }
-        if (bkpinfo->nfs_remote_dir) {
-            log_msg(2, "nfs_remote_dir remains %s", bkpinfo->nfs_remote_dir);
+        if (bkpinfo->netfs_mount) {
+            log_msg(2, "netfs_mount remains %s", bkpinfo->netfs_mount);
+        }
+        if (bkpinfo->netfs_remote_dir) {
+            log_msg(2, "netfs_remote_dir remains %s", bkpinfo->netfs_remote_dir);
         }
         log_msg(2, "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
     } else {
-        mr_free(bkpinfo->nfs_mount);
-        bkpinfo->nfs_mount = read_cfg_var(g_mondo_cfg_file, "nfs-server-mount");
-
-        mr_free(bkpinfo->nfs_remote_dir);
-        bkpinfo->nfs_remote_dir = read_cfg_var(g_mondo_cfg_file, "nfs-server-path");
-
-        if (bkpinfo->nfs_mount != NULL) {
-            log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
-        }
-        if (bkpinfo->nfs_remote_dir != NULL) {
-            log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
+        mr_free(bkpinfo->netfs_mount);
+        bkpinfo->netfs_mount = read_cfg_var(g_mondo_cfg_file, "netfs-server-mount");
+
+        mr_free(bkpinfo->netfs_remote_dir);
+        bkpinfo->netfs_remote_dir = read_cfg_var(g_mondo_cfg_file, "netfs-server-path");
+
+        if (bkpinfo->netfs_mount != NULL) {
+            log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
+        }
+        if (bkpinfo->netfs_remote_dir != NULL) {
+            log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
+        }
+        if (bkpinfo->netfs_proto != NULL) {
+            log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
         }
     }
     if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "pxe")) {
         /* We need to override values in PXE mode as it's
-        * already done in start-nfs */
-        envtmp1 = getenv("nfsmount");
+        * already done in start-netfs */
+        envtmp1 = getenv("netfsmount");
         if (envtmp1 == NULL) {
-            fatal_error("no nfsmount variable in environment");
+            fatal_error("no netfsmount variable in environment");
         }
         envtmp2 = getenv("dirimg");
@@ -978 +982 @@
             fatal_error("no dirimg variable in environment");
         }
-        mr_free(bkpinfo->nfs_mount);
-        mr_asprintf(bkpinfo->nfs_mount, "%s", envtmp1);
-
-        mr_free(bkpinfo->nfs_remote_dir);
-        mr_asprintf(bkpinfo->nfs_remote_dir, "%s", envtmp2);
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", envtmp1);
+
+        mr_free(bkpinfo->netfs_remote_dir);
+        mr_asprintf(bkpinfo->netfs_remote_dir, "%s", envtmp2);
     }
 } else if (bkpinfo->backup_media_type == iso) {

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

branches/2.2.10/mondo/src/mondorestore/mr-externs.h

@@ -107 +107 @@
 extern bool g_text_mode;
 extern bool g_restoring_live_from_cd;
-extern bool g_restoring_live_from_nfs;
+extern bool g_restoring_live_from_netfs;
 extern int fput_string_one_char_at_a_time(FILE *, char *);
 extern char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res);