Changeset 2380 in MondoRescue for branches/2.2.9/mondo/src

Timestamp:

Sep 9, 2009, 8:30:47 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Change NFS support into a NetFS support to allow for multiple protocol in addition to NFS (NEEDS TESTING)
• Better logging to detect a potential nuke issue

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• common/libmondo-cli.c (modified) (15 diffs)
• common/libmondo-devices-EXT.h (modified) (1 diff)
• common/libmondo-devices.c (modified) (21 diffs)
• common/libmondo-devices.h (modified) (1 diff)
• common/libmondo-files-EXT.h (modified) (1 diff)
• common/libmondo-files.c (modified) (2 diffs)
• common/libmondo-files.h (modified) (1 diff)
• common/libmondo-fork.c (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (2 diffs)
• common/libmondo-string.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (5 diffs)
• common/libmondo-verify.c (modified) (2 diffs)
• common/mondostructures.h (modified) (2 diffs)
• common/newt-specific.c (modified) (6 diffs)
• include/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (6 diffs)
• mondorestore/mondorestore.c (modified) (4 diffs)
• mondorestore/mr-externs.h (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-archive.c

@@ -787 +787 @@
         mr_asprintf(&value, "iso");
         break;
-    case nfs:
-        mr_asprintf(&value, "nfs");
+    case netfs:
+        mr_asprintf(&value, "netfs");
         break;
     case dvd:
@@ -858 +858 @@
     estimated_total_noof_slices =
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-    /* add nfs stuff here? */
+    /* add netfs stuff here? */
     mr_asprintf(&command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
@@ -1262 +1262 @@
 
     sprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
-            bkpinfo->nfs_remote_dir, bkpinfo->prefix);
+            bkpinfo->netfs_remote_dir, bkpinfo->prefix);
     paranoid_system(command);
     wipe_archives(bkpinfo->scratchdir);
@@ -3286 +3286 @@
  * - @c manual_cd_tray
  * - @c media_size
- * - @c nfs_mount
- * - @c nfs_remote_dir
+ * - @c netfs_mount
+ * - @c netfs_remote_dir
  * - @c scratchdir
  * - @c verify_data
@@ -3363 +3363 @@
     }
     sprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->nfs_remote_dir, bkpinfo->prefix,
+            bkpinfo->netfs_remote_dir, bkpinfo->prefix,
             g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -55 +55 @@
 static void free_mounted_fs_list (void);
 static int get_dsf_mount_list (const char *dsf, char **included_dsf_list, char **excluded_dsf_list);
-static int create_list_of_non_NFS_mounted_file_systems (void);
+static int create_list_of_non_NETFS_mounted_file_systems (void);
 static MOUNTED_FS_STRUCT *find_mount_point_in_list (char *mount_point);
 static MOUNTED_FS_STRUCT *find_device_in_list (char *device);
@@ -178 +178 @@
 /**
  * Frees the memory for all of the structures on the linked list of 
- * all of the non-NFS mounted file systems.
+ * all of the non-NETFS mounted file systems.
  */
 static void free_mounted_fs_list (void) {
@@ -195 +195 @@
 
 /**
- * Creates a singly linked list of all of the non-NFS mounted file systems.
+ * Creates a singly linked list of all of the non-NETFS mounted file systems.
  * @param DSFptr A pointer  to the structure MOUNTED_FS_STRUCT used to hold 
  * the list of mounted file systems. 
@@ -213 +213 @@
 
 /**
- * Find the structure, in the singly linked list of all of the non-NFS 
+ * Find the structure, in the singly linked list of all of the non-NETFS 
  * mounted file systems, that contains the specified device.
  * @param device The device to find 
@@ -234 +234 @@
 
 /**
- * Find the structure, in the singly linked list of all of the non-NFS 
+ * Find the structure, in the singly linked list of all of the non-NETFS 
  * mounted file systems, that contains the specified mount point.
  * @param mount_point The mount point to find 
@@ -255 +255 @@
 
 /**
- * Creates a linked list of all of the non-NFS mounted file systems.
+ * Creates a linked list of all of the non-NETFS mounted file systems.
  * We use a linked list because we don't know how many  mounted file
  * there are (and there can be a lot).
  * @return 0 on success and greated than 0 on failure. 
  */
-static int create_list_of_non_NFS_mounted_file_systems (void)
+static int create_list_of_non_NETFS_mounted_file_systems (void)
 {
     int i = 0;
@@ -388 +388 @@
 
     /* Get a list of the mounted file systems */
-    if (create_list_of_non_NFS_mounted_file_systems()) {
+    if (create_list_of_non_NETFS_mounted_file_systems()) {
         log_to_screen ("Could not get the list of mounted file systems");
         return (1);
@@ -992 +992 @@
 
     if (flag_set['n']) {
-        strncpy(bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
+        strncpy(bkpinfo->netfs_mount, flag_val['n'], MAX_STR_LEN);
         if (!flag_set['d']) {
-            strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
-        }
-        /* test if we specified a user for the NFS dialog */
-        p = strchr(bkpinfo->nfs_mount, '@');
+            strncpy(bkpinfo->netfs_remote_dir, "/", MAX_STR_LEN);
+        }
+        /* test for protocol */
+        p = strchr(bkpinfo->netfs_mount, ':');
+        if (p == NULL) {
+            /* protocol not found abort */
+            fatal_error("No protocol specified for remote share mount. Please do man mondoarchive as syntax changed");
+        } else {
+            /* Proto found. Store the 2 values */
+            p++;
+            if (*p != '/') {
+                fatal_error("No protocol correctly specified for remote share mount. Use protocol://server:share");
+            }
+            p++;
+            if (*p != '/') {
+                fatal_error("No protocol correctly specified for remote share mount. Use protocol://server:share");
+            }
+            /* new netfs mount */
+            strcpy(tmp,p);
+            p--;
+            p--;
+            p--;
+            *p = '\0';
+            mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
+            bkpinfo->netfs_proto = q;
+            strcpy(bkpinfo->netfs_mount,tmp);
+        }
+        /* test if we specified a user */
+        p = strchr(bkpinfo->netfs_mount, '@');
         if (p != NULL) {
             /* User found. Store the 2 values */
             p++;
-            /* new NFS mount */
+            /* new netfs mount */
             strcpy(tmp,p);
             p--;
             *p = '\0';
-            mr_asprintf(&q,"%s",bkpinfo->nfs_mount);
-            bkpinfo->nfs_user = q;
-            strcpy(bkpinfo->nfs_mount,tmp);
+            mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
+            bkpinfo->netfs_user = q;
+            strcpy(bkpinfo->netfs_mount,tmp);
         }
         sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
-                bkpinfo->nfs_mount);
+                bkpinfo->netfs_mount);
         strncpy(bkpinfo->isodir,
                 call_program_and_get_last_line_of_output(tmp),
                 MAX_STR_LEN / 4);
         if (strlen(bkpinfo->isodir) < 3) {
-            log_to_screen("NFS share is not mounted. Trying to mount it for you.\n");
-            sprintf(tmp, "mount %s", bkpinfo->nfs_mount);
+            log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
+            if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
+            } else {
+                sprintf(tmp, "mount %s", bkpinfo->netfs_mount);
+            }
             if (system(tmp)) {
-                log_to_screen("Unable to mount NFS share %s. Please mount manually.\n", bkpinfo->nfs_mount);
+                log_to_screen("Unable to mount Network share %s. Please mount manually.\n", bkpinfo->netfs_mount);
                 retval++;
             } else {
                 sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
-                    bkpinfo->nfs_mount);
+                    bkpinfo->netfs_mount);
                 strncpy(bkpinfo->isodir,
                         call_program_and_get_last_line_of_output(tmp),
@@ -1028 +1057 @@
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;
-                    log_to_screen("NFS share %s is strangely not mounted. Please mount manually...\n", bkpinfo->nfs_mount);
+                    log_to_screen("Network share %s is strangely not mounted. Please mount manually...\n", bkpinfo->netfs_mount);
                 }
             }
         }
-        log_msg(3, "mount = %s", bkpinfo->nfs_mount);
+        log_msg(3, "mount = %s", bkpinfo->netfs_mount);
         log_msg(3, "isodir= %s", bkpinfo->isodir);
     }
@@ -1046 +1075 @@
     }
     if (flag_set['n']) {
-        bkpinfo->backup_media_type = nfs;
-        /* Never try to eject a NFS device */
+        bkpinfo->backup_media_type = netfs;
+        /* Never try to eject a Network device */
         bkpinfo->please_dont_eject = TRUE;
     }
@@ -1155 +1184 @@
     }
 
-    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude NFS mounts & devices
+    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude Network mounts & devices
     {
-//      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
-        mr_asprintf(&psz, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(&psz, "%s", list_of_NETFS_mounts_only());
         if (bkpinfo->exclude_paths[0]) {
             strncat(bkpinfo->exclude_paths, " ", 4*MAX_STR_LEN);
@@ -1233 +1261 @@
     }
 
-    if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
+    if (flag_set['d']) {        /* backup directory (if ISO/NETFS) */
         if (flag_set['i']) {
             strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
@@ -1242 +1270 @@
             }
         } else if (flag_set['n']) {
-            strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
+            strncpy(bkpinfo->netfs_remote_dir, flag_val['d'], MAX_STR_LEN);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
@@ -1249 +1277 @@
 
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
-        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
-        if (bkpinfo->nfs_user) {
-            sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->nfs_user, tmp1);
+        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
+        if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
+            sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
         } else {
             sprintf(tmp, "echo hi > %s", tmp1);
@@ -1259 +1287 @@
             sprintf(tmp,
                     "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
-                    bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
+                    bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
             log_to_screen(tmp);
         }

branches/2.2.9/mondo/src/common/libmondo-devices-EXT.h

@@ -46 +46 @@
 extern int eject_device(char *);
 
-extern char *list_of_NFS_devices_and_mounts();
-extern char *list_of_NFS_mounts_only(void);
+extern char *list_of_NETFS_devices_and_mounts();
+extern char *list_of_NETFS_mounts_only(void);
 
 extern void sensibly_set_tmpdir_and_scratchdir();

branches/2.2.9/mondo/src/common/libmondo-devices.c

@@ -54 +54 @@
  */
 bool g_restoring_live_from_cd = FALSE;
-bool g_restoring_live_from_nfs = FALSE;
+bool g_restoring_live_from_netfs = FALSE;
 
 extern t_bkptype g_backup_media_type;   // set by main()
@@ -179 +179 @@
         strcpy(output, "cdstream");
         break;
-    case nfs:
-        strcpy(output, "nfs");
+    case netfs:
+        strcpy(output, "netfs");
         break;
     case tape:
@@ -1376 +1376 @@
     run_program_and_log_output(tmp, 5);
     if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
-        || bkpinfo->backup_media_type == nfs) {
+        || bkpinfo->backup_media_type == netfs) {
         log_msg(3, "Remounting CD");
         g_ISO_restore_mode = TRUE;
@@ -1387 +1387 @@
         (void)system(tmp);
         sprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-                bkpinfo->nfs_remote_dir, bkpinfo->prefix,
+                bkpinfo->netfs_remote_dir, bkpinfo->prefix,
                 cd_number_i_want);
         if (!does_file_exist(tmp)) {
             sprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir,
-                    bkpinfo->nfs_remote_dir, bkpinfo->prefix,
+                    bkpinfo->netfs_remote_dir, bkpinfo->prefix,
                     cd_number_i_want);
             if (does_file_exist(tmp)) {
@@ -1486 +1486 @@
     bkpinfo->nonbootable_backup = FALSE;
 
-    // Tape, CD, NFS, ...?
+    // Tape, CD, NETFS, ...?
     srandom(getpid());
     bkpinfo->backup_media_type =
@@ -1726 +1726 @@
 
 
-    case nfs:
-        /* Never try to eject a NFS device */
+    case netfs:
+        /* Never try to eject a NETFS device */
         bkpinfo->please_dont_eject = TRUE;
 
-        /* Initiate bkpinfo nfs_mount path from running environment if not already done */
-        if (!bkpinfo->nfs_mount[0]) {
-            strcpy(bkpinfo->nfs_mount,
+        /* Initiate bkpinfo netfs_mount path from running environment if not already done */
+        if (!bkpinfo->netfs_mount[0]) {
+            strcpy(bkpinfo->netfs_mount,
                    call_program_and_get_last_line_of_output
                    ("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
@@ -1743 +1743 @@
         {
             if (!popup_and_get_string
-                ("NFS dir.",
+                ("Network shared dir.",
                  "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)",
-                 bkpinfo->nfs_mount, MAX_STR_LEN / 4)) {
+                 bkpinfo->netfs_mount, MAX_STR_LEN / 4)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -1758 +1758 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            strip_spaces(bkpinfo->nfs_mount);
-            if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
-                bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
+            strip_spaces(bkpinfo->netfs_mount);
+            if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
+                bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
             sprintf(command, "mount | grep \"%s \" | cut -d' ' -f3",
-                    bkpinfo->nfs_mount);
+                    bkpinfo->netfs_mount);
             strcpy(bkpinfo->isodir,
                    call_program_and_get_last_line_of_output(command));
@@ -1788 +1788 @@
             (void)system(command);
             if (!popup_and_get_string
-                ("NFS share", "Which remote NFS share should I mount?",
-                 bkpinfo->nfs_mount, MAX_STR_LEN)) {
+                ("Network share", "Which remote share should I mount?",
+                 bkpinfo->netfs_mount, MAX_STR_LEN)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -1795 +1795 @@
         }
         /* Initiate bkpinfo isodir path from running environment if mount already done */
-        if (is_this_device_mounted(bkpinfo->nfs_mount)) {
+        if (is_this_device_mounted(bkpinfo->netfs_mount)) {
             strcpy(bkpinfo->isodir,
                    call_program_and_get_last_line_of_output
                    ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
         } else {
-            sprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
+            sprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
             sprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
             if (bkpinfo->restore_data) {
-                mr_asprintf(&tmp, "mount -t nfs -o nolock,ro %s %s", bkpinfo->nfs_mount, bkpinfo->isodir);
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    mr_asprintf(&tmp, "sshfs -o ro %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                } else {
+                    mr_asprintf(&tmp, "mount -t %s -o nolock,ro %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
+                }
             } else {
-                mr_asprintf(&tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount, bkpinfo->isodir);
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    mr_asprintf(&tmp, "sshfs %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                } else {
+                    mr_asprintf(&tmp, "mount -t %s -o nolock %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
+                }
             }
             run_program_and_log_output(tmp, 3);
@@ -1814 +1822 @@
             strcpy(g_selfmounted_isodir, bkpinfo->isodir);
         }
-        if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
+        if (!is_this_device_mounted(bkpinfo->netfs_mount)) {
             popup_and_OK
                 ("Please mount that partition before you try to backup to or restore from it.");
             finish(1);
         }
-        strcpy(tmp1, bkpinfo->nfs_remote_dir);
+        strcpy(tmp1, bkpinfo->netfs_remote_dir);
         if (!popup_and_get_string
             ("Directory", "Which directory within that mountpoint?", tmp1,
@@ -1826 +1834 @@
             finish(1);
         }
-        strcpy(bkpinfo->nfs_remote_dir, tmp1);
+        strcpy(bkpinfo->netfs_remote_dir, tmp1);
 
         // check whether writable - we better remove surrounding spaces for this
-        strip_spaces(bkpinfo->nfs_remote_dir);
+        strip_spaces(bkpinfo->netfs_remote_dir);
 
         if (!popup_and_get_string
@@ -1843 +1851 @@
             bkpinfo->media_size[i] = 650;
         }
-        log_msg(3, "Just set nfs_remote_dir to %s",
-                bkpinfo->nfs_remote_dir);
+        log_msg(3, "Just set netfs_remote_dir to %s",
+                bkpinfo->netfs_remote_dir);
         log_msg(3, "isodir is still %s", bkpinfo->isodir);
         break;
@@ -1961 +1969 @@
             finish(1);
         }
-        mr_asprintf(&tmp, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(&tmp, "%s", list_of_NETFS_mounts_only());
         if (strlen(tmp) > 2) {
             if (bkpinfo->exclude_paths[0]) {
@@ -2033 +2041 @@
 
     if (bkpinfo->backup_media_type == iso
-        || bkpinfo->backup_media_type == nfs) {
+        || bkpinfo->backup_media_type == netfs) {
         g_ISO_restore_mode = TRUE;
     }
@@ -2039 +2047 @@
 // skip
 #else
-    if (bkpinfo->backup_media_type == nfs) {
-        log_msg(3, "I think the NFS mount is mounted at %s",
+    if (bkpinfo->backup_media_type == netfs) {
+        log_msg(3, "I think the Remote mount is mounted at %s",
                 bkpinfo->isodir);
     }
     log_it("isodir = %s", bkpinfo->isodir);
-    log_it("nfs_mount = '%s'", bkpinfo->nfs_mount);
-    if (bkpinfo->nfs_user) {
-        log_it("nfs_user = '%s'", bkpinfo->nfs_user);
+    log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
+    if (bkpinfo->netfs_user) {
+        log_it("netfs_user = '%s'", bkpinfo->netfs_user);
     }
 #endif
@@ -2087 +2096 @@
  */
 /**
- * Get a space-separated list of NFS devices and mounts.
+ * Get a space-separated list of NETFS devices and mounts.
  * @return The list created.
  * @note The return value points to static data that will be overwritten with each call.
  */
-char *list_of_NFS_devices_and_mounts(void)
+char *list_of_NETFS_devices_and_mounts(void)
 {
     char *exclude_these_devices = NULL;
@@ -2097 +2106 @@
     static char result_sz[1024];
 
-    mr_asprintf(&exclude_these_directories,"%s",list_of_NFS_mounts_only());
-    mr_asprintf(&exclude_these_devices,"%s", call_program_and_get_last_line_of_output("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+    mr_asprintf(&exclude_these_directories,"%s",list_of_NETFS_mounts_only());
+    mr_asprintf(&exclude_these_devices,"%s", call_program_and_get_last_line_of_output("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|sshfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     snprintf(result_sz, 1023, "%s %s", exclude_these_directories, exclude_these_devices);
     mr_free(exclude_these_devices);
@@ -2109 +2118 @@
 
 /**
- * Get a space-separated list of NFS mounts.
+ * Get a space-separated list of NETFS mounts.
  * @return The list created.
  * @note The return value points to static data that will be overwritten with each call.
  * @bug Even though we only want the mounts, the devices are still checked.
  */
-char *list_of_NFS_mounts_only(void)
+char *list_of_NETFS_mounts_only(void)
 {
     char *exclude_these_directories = NULL;
     static char result_sz[512];
 
-    mr_asprintf(&exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+    mr_asprintf(&exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     snprintf(result_sz, 511, "%s", exclude_these_directories);
     mr_free(exclude_these_directories);
@@ -2176 +2185 @@
     mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 
@@ -2606 +2615 @@
     malloc_string(command);
     malloc_string(fdisk);
-    log_msg(0, "Looking for partition table format type");
     sprintf(fdisk, "/sbin/parted2fdisk");
-    log_msg(1, "Using %s", fdisk);
     sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));

branches/2.2.9/mondo/src/common/libmondo-devices.h

@@ -38 +38 @@
 int eject_device(char *);
 
-char *list_of_NFS_devices_and_mounts();
-char *list_of_NFS_mounts_only();
+char *list_of_NETFS_devices_and_mounts();
+char *list_of_NETFS_mounts_only();
 
 void sensibly_set_tmpdir_and_scratchdir();

branches/2.2.9/mondo/src/common/libmondo-files-EXT.h

@@ -33 +33 @@
 extern long size_of_all_biggiefiles_K();
 extern void copy_mondo_and_mindi_stuff_to_scratchdir();
-extern void store_nfs_config();
+extern void store_netfs_config();
 
 

branches/2.2.9/mondo/src/common/libmondo-files.c

@@ -1091 +1091 @@
 
 /**
- * Store the client's NFS configuration in files to be restored at restore-time.
- * Assumes that @c bkpinfo->media_type = nfs, but does not check for this.
+ * Store the client's NETFS configuration in files to be restored at restore-time.
+ * Assumes that @c bkpinfo->media_type = netfs, but does not check for this.
  * @param bkpinfo The backup information structure. Fields used:
- * - @c nfs_mount
- * - @c nfs_remote_dir
+ * - @c netfs_mount
+ * - @c netfs_remote_dir
  * - @c tmpdir
  */
-void store_nfs_config()
+void store_netfs_config()
 {
 
     /*@ buffers ******** */
-    char nfs_dev[MAX_STR_LEN];
+    char netfs_dev[MAX_STR_LEN];
     char mac_addr[MAX_STR_LEN];
-    char nfs_mount[MAX_STR_LEN];
-    char nfs_client_ipaddr[MAX_STR_LEN];
-    char nfs_client_netmask[MAX_STR_LEN];
-    char nfs_client_broadcast[MAX_STR_LEN];
-    char nfs_client_defgw[MAX_STR_LEN];
-    char nfs_server_ipaddr[MAX_STR_LEN];
+    char netfs_mount[MAX_STR_LEN];
+    char netfs_client_ipaddr[MAX_STR_LEN];
+    char netfs_client_netmask[MAX_STR_LEN];
+    char netfs_client_broadcast[MAX_STR_LEN];
+    char netfs_client_defgw[MAX_STR_LEN];
+    char netfs_server_ipaddr[MAX_STR_LEN];
     char tmp[MAX_STR_LEN];
     char command[MAX_STR_LEN * 2];
@@ -1116 +1116 @@
     char *p;
 
-    log_it("Storing NFS configuration");
-    strcpy(tmp, bkpinfo->nfs_mount);
+    log_it("Storing Network configuration");
+    strcpy(tmp, bkpinfo->netfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
         fatal_error
-            ("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
+            ("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
     *(p++) = '\0';
-    strcpy(nfs_server_ipaddr, tmp);
-    strcpy(nfs_mount, p);
+    strcpy(netfs_server_ipaddr, tmp);
+    strcpy(netfs_mount, p);
 
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-    strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
+    strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
-    strcpy(nfs_client_ipaddr,
+    strcpy(netfs_client_ipaddr,
            call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
-    strcpy(nfs_client_netmask,
+    strcpy(netfs_client_netmask,
            call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
-    strcpy(nfs_client_broadcast,
+    strcpy(netfs_client_broadcast,
            call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "route -n | grep '^0.0.0.0' | awk '{print $2}'");
-    strcpy(nfs_client_defgw,
+    strcpy(netfs_client_defgw,
            call_program_and_get_last_line_of_output(command));
     sprintf(tmp,
-            "nfs_client_ipaddr=%s; nfs_server_ipaddr=%s; nfs_mount=%s",
-            nfs_client_ipaddr, nfs_server_ipaddr, nfs_mount);
-    if (strlen(nfs_dev) < 2) {
+            "netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s",
+            netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
+    if (strlen(netfs_dev) < 2) {
         fatal_error
-            ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified.");
+            ("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
     }
     /********
-    * If the NFS device that found above is a bonded device, 
+    * If the Network device that found above is a bonded device, 
     * we need to replace it with an ethN device or the
-    * networking will not start during an NFS restore.
+    * networking will not start during an Network restore.
     *
-    * If the NFS device in nfs_dev begins with the word "bond", or alb or aft
-    * look for the corresponding slave ethN device and copy it to nfs_dev.
+    * If the Network device in netfs_dev begins with the word "bond", or alb or aft
+    * look for the corresponding slave ethN device and copy it to netfs_dev.
     * Using the common MAC address
     ********/
-    if (!strncmp(nfs_dev, "bond", 4) || !strncmp(nfs_dev, "alb", 3) || !strncmp(nfs_dev, "aft", 3)) {
-        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
+    if (!strncmp(netfs_dev, "bond", 4) || !strncmp(netfs_dev, "alb", 3) || !strncmp(netfs_dev, "aft", 3)) {
+        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
         sprintf(command,
-                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
+                "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
         strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
         sprintf(command,
-                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
-        strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
-        log_to_screen("Replacing it with %s\n", nfs_dev);
-    }
-
-    sprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_dev);
-
-    sprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_ipaddr);
-    sprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_netmask);
-    sprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_broadcast);
-    sprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_defgw);
-    sprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_server_ipaddr);
-    sprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
-    sprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,netfs_dev);
+        strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
+        log_to_screen("Replacing it with %s\n", netfs_dev);
+    }
+
+    sprintf(tmp, "%s/NETFS-DEV", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_dev);
+
+    sprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
+
+    sprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_ipaddr);
+    sprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_netmask);
+    sprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_broadcast);
+    sprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_defgw);
+    sprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_server_ipaddr);
+    sprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
+    sprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
     sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->prefix);
-    log_it("Finished storing NFS configuration");
+    log_it("Finished storing Network configuration");
 }
 

branches/2.2.9/mondo/src/common/libmondo-files.h

@@ -33 +33 @@
 
 void copy_mondo_and_mindi_stuff_to_scratchdir();
-void store_nfs_config();
+void store_netfs_config();
 void estimate_noof_media_required(long);
 bool is_this_file_compressed(char *);

branches/2.2.9/mondo/src/common/libmondo-fork.c

@@ -133 +133 @@
     old_stderr[0] = '\0';
 
-    if (bkpinfo->nfs_user) {
-        mr_asprintf(&tmp1, "su - %s -c \"%s\"", bkpinfo->nfs_user, basic_call);
+    if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
+        mr_asprintf(&tmp1, "su - %s -c \"%s\"", bkpinfo->netfs_user, basic_call);
     } else {
         mr_asprintf(&tmp1, "%s", basic_call);

branches/2.2.9/mondo/src/common/libmondo-mountlist.c

@@ -390 +390 @@
             continue;
         }
+        log_msg(2, "Processing partition %s on %s #%d in mountlist", device, drive, pos);
         /* gap in the partition list? */
         if (curr_part_no - prev_part_no > 1) {
@@ -483 +484 @@
     if (res == 0) {
         mr_free(flaws_str);
+        log_msg(2, "Fine, no error in evaluate_drive_within_mountlist");
         return (NULL);
     } else {
+        log_msg(2, "Error in evaluate_drive_within_mountlist: %s", flaws_str);
         return (flaws_str);
     }

branches/2.2.9/mondo/src/common/libmondo-string.c

@@ -1119 +1119 @@
         mr_asprintf(&type_of_backup, "ISO");
         break;
-    case nfs:
-        mr_asprintf(&type_of_backup, "nfs");
+    case netfs:
+        mr_asprintf(&type_of_backup, "netfs");
         break;
     case usb:

branches/2.2.9/mondo/src/common/libmondo-tools.c

@@ -395 +395 @@
  * - Used: @c bkpinfo->make_cd_use_lilo
  * - Used: @c bkpinfo->media_device
- * - Used: @c bkpinfo->nfs_mount
+ * - Used: @c bkpinfo->netfs_mount
  * - Used: @c bkpinfo->nonbootable_backup
  * - Used: @c bkpinfo->scratchdir
@@ -668 +668 @@
     }                           // end of iso code
 
-    if (bkpinfo->backup_media_type == nfs) {
-        strcpy(hostname, bkpinfo->nfs_mount);
+    if (bkpinfo->backup_media_type == netfs) {
+        strcpy(hostname, bkpinfo->netfs_mount);
         colon = strchr(hostname, ':');
         if (!colon) {
-            log_it("nfs mount doesn't have a colon in it");
+            log_it("netfs mount doesn't have a colon in it");
             retval++;
         } else {
@@ -680 +680 @@
             hent = gethostbyname(hostname);
             if (!hent) {
-                log_it("Can't resolve NFS mount (%s): %s", hostname,
+                log_it("Can't resolve Network mount (%s): %s", hostname,
                        hstrerror(h_errno));
                 retval++;
             } else {
                 mr_asprintf(&ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
-                mr_strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
-                strcpy(bkpinfo->nfs_mount, ip_address);
+                mr_strcat(ip_address, strchr(bkpinfo->netfs_mount, ':'));
+                strcpy(bkpinfo->netfs_mount, ip_address);
                 paranoid_free(ip_address);
             }
         }
-        store_nfs_config();
+        store_netfs_config();
     }
 
@@ -759 +759 @@
     }
     g_current_media_number = 1;
-    bkpinfo->postnuke_tarball[0] = bkpinfo->nfs_mount[0] = '\0';
+    bkpinfo->postnuke_tarball[0] = bkpinfo->netfs_mount[0] = '\0';
     return (res);
 }
@@ -846 +846 @@
     bkpinfo->call_after_iso[0] = '\0';
     bkpinfo->kernel_path[0] = '\0';
-    bkpinfo->nfs_mount[0] = '\0';
-    bkpinfo->nfs_user = NULL;
-    bkpinfo->nfs_remote_dir[0] = '\0';
+    bkpinfo->netfs_mount[0] = '\0';
+    bkpinfo->netfs_proto = NULL;
+    bkpinfo->netfs_user = NULL;
+    bkpinfo->netfs_remote_dir[0] = '\0';
     bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->wipe_media_first = FALSE;

branches/2.2.9/mondo/src/common/libmondo-verify.c

@@ -1055 +1055 @@
  * - @c bkpinfo->manual_cd_tray
  * - @c bkpinfo->media_device
- * - @c bkpinfo->nfs_remote_dir
+ * - @c bkpinfo->netfs_remote_dir
  * - @c bkpinfo->tmpdir
  * - @c bkpinfo->verify_data
@@ -1090 +1090 @@
 
     sprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir,
             bkpinfo->prefix, g_current_media_number);
 

branches/2.2.9/mondo/src/common/mondostructures.h

@@ -183 +183 @@
     dvd,                        ///< Back up to DVD+R[W] or DVD-R[W] disks.
     cdstream,                   ///< Back up to recordable CDs but treat them like a tape streamer.
-    nfs,                        ///< Back up to an NFS mount on the local subnet.
+    netfs,                      ///< Back up to an NETFS mount on the local subnet.
     tape,                       ///< Back up to tapes.
     usb,                        ///< Back up to USB devices.
@@ -558 +558 @@
 
   /**
-   * The NFS mount to back up to/restore from.
-   * If backup_media_type is not @b nfs, this is ignored.
+   * The NETFS mount to back up to/restore from.
+   * If backup_media_type is not @b netfs, this is ignored.
    * It must contain a colon, and the server's address should be in dotted-decimal IP
    * address form. (Domain names will be resolved in post_param_configuration().)
    */
-    char nfs_mount[MAX_STR_LEN];
-
-  /**
-   * The directory, relative to the root of @p nfs_mount, to put
+    char netfs_mount[MAX_STR_LEN];
+
+  /**
+   * The directory, relative to the root of @p netfs_mount, to put
    * the backups in.
    */
-    char nfs_remote_dir[MAX_STR_LEN];
-
-  /**
-   * The potential user to use for NFS backup
-   */
-    char *nfs_user;
+    char netfs_remote_dir[MAX_STR_LEN];
+
+  /**
+   * The potential user to use for NETFS backup
+   */
+    char *netfs_user;
+
+  /**
+   * The protocol to use for Network backup (NFS, SSHFS, ...)
+   */
+    char *netfs_proto;
 
   /**

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -101 +101 @@
      g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
     bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
-    char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
+    char *g_selfmounted_isodir; ///< Holds the NETFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
@@ -445 +445 @@
         }
         /* Free all allocated strings in bkpinfo */
-        mr_free(bkpinfo->nfs_user);
+        mr_free(bkpinfo->netfs_user);
+        mr_free(bkpinfo->netfs_proto);
 
         /* Then free the structure */
@@ -1252 +1253 @@
  * Ask the user which backup media type they would like to use.
  * The choices are @p none (exit to shell), @c cdr, @c cdrw, @c dvd,
- * @c tape, @c cdstream, @c udev (only when @p g_text_mode is TRUE), @c nfs,
+ * @c tape, @c cdstream, @c udev (only when @p g_text_mode is TRUE), @c netfs,
  * and @c iso.
  * @param restoring TRUE if we're restoring, FALSE if we're backing up.
@@ -1267 +1268 @@
         char *minimsg_sz;
         static t_bkptype possible_bkptypes[] =
-            { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
+            { none, cdr, cdrw, dvd, tape, cdstream, udev, netfs, iso };
         static char *possible_responses[] =
             { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
-"nfs", "iso", NULL };
+"netfs", "iso", NULL };
         char *outstr;
         t_bkptype backup_type;
@@ -1328 +1329 @@
         b4 = newtButton(17, 5, "USB Key/Disk");
         b5 = newtButton(1, 5, " DVD disks ");
-        b6 = newtButton(17, 9, " NFS mount ");
+        b6 = newtButton(17, 9, " Net mount ");
         b7 = newtButton(1, 13, " Hard disk ");
         b8 = newtButton(17, 13, "    Exit   ");
@@ -1348 +1349 @@
             output = dvd;
         } else if (b_res == b6) {
-            output = nfs;
+            output = netfs;
         } else if (b_res == b7) {
             output = iso;

branches/2.2.9/mondo/src/include/my-stuff.h

@@ -318 +318 @@
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
-#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2"
+#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda fuse.sshfs nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2"
 #define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"

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

@@ -2297 +2297 @@
         strcpy(isodir_path, "/");
     }
-    if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
-        strcpy(isodir_device, last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
-        strcpy(isodir_format, "nfs");
-        strcpy(isodir_path, last_line_of_file("/tmp/NFS-SERVER-PATH"));
+    if (does_file_exist("/tmp/NETFS-SERVER-PATH")) {
+        strcpy(isodir_device, last_line_of_file("/tmp/NETFS-SERVER-MOUNT"));
+        strcpy(isodir_format, "netfs");
+        strcpy(isodir_path, last_line_of_file("/tmp/NETFS-SERVER-PATH"));
     }
     if (nuke_me_please) {

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

@@ -614 +614 @@
     }
 
-    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 ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
@@ -624 +624 @@
 #ifdef __FreeBSD__
         sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+            bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
         sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+            bkpinfo->isodir, bkpinfo->netfs_remote_dir,
             bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
@@ -805 +805 @@
             strcpy(bkpinfo->prefix,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;
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
@@ -816 +816 @@
        ("cat /proc/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) {
@@ -961 +961 @@
 }
 
-if (bkpinfo->backup_media_type == nfs) {
+if (bkpinfo->backup_media_type == netfs) {
     if (!cfgf) {
-        log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
-        log_msg(2, "nfs_remote_dir remains %s",
-                bkpinfo->nfs_remote_dir);
+        log_msg(2, "netfs_mount remains %s", bkpinfo->netfs_mount);
+        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 {
-        read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
-                    bkpinfo->nfs_mount);
-        read_cfg_var(g_mondo_cfg_file, "nfs-server-path",
-                    bkpinfo->nfs_remote_dir);
-        log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
-        log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
+        read_cfg_var(g_mondo_cfg_file, "netfs-server-mount",
+                    bkpinfo->netfs_mount);
+        read_cfg_var(g_mondo_cfg_file, "netfs-server-path",
+                    bkpinfo->netfs_remote_dir);
+        log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
+        log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
+        log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
     }
     if (strstr(call_program_and_get_last_line_of_output
         ("cat /proc/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");
@@ -988 +989 @@
             fatal_error("no dirimg variable in environment");
         }
-        strcpy(bkpinfo->nfs_mount,envtmp1);
-        strcpy(bkpinfo->nfs_remote_dir,envtmp2);
+        strcpy(bkpinfo->netfs_mount,envtmp1);
+        strcpy(bkpinfo->netfs_remote_dir,envtmp2);
     }
 } else if (bkpinfo->backup_media_type == iso) {

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

@@ -964 +964 @@
 
     strcpy(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);
     }
@@ -990 +990 @@
     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");
         strcpy(old_restpath, bkpinfo->restore_path);
@@ -3096 +3096 @@
         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;
         }
         log_msg(2, "Calling restore_to_live_filesystem()");
@@ -3123 +3123 @@
         // BCO:To be reviewed
         if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
-            if (bkpinfo->backup_media_type == nfs
-                && !is_this_device_mounted(bkpinfo->nfs_mount)) {
-                log_msg(1, "Mounting nfs dir");
+            if (bkpinfo->backup_media_type == netfs
+                && !is_this_device_mounted(bkpinfo->netfs_mount)) {
+                log_msg(1, "Mounting remote %s dir", bkpinfo->netfs_proto);
                 sprintf(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-                sprintf(tmp, "mount %s -t nfs -o nolock,ro /tmp/isodir",
-                        bkpinfo->nfs_mount);
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    sprintf(tmp, "sshfs -o ro /tmp/isodir",
+                        bkpinfo->netfs_mount);
+                } else {
+                    sprintf(tmp, "mount %s -o nolock,ro /tmp/isodir",
+                        bkpinfo->netfs_mount);
                 run_program_and_log_output(tmp, 1);
             }

branches/2.2.9/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);