Changeset 2382 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.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/common/libmondo-devices.c (modified) (21 diffs)

branches/2.2.10/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()
@@ -164 +164 @@
         mr_asprintf(output, "cdstream");
         break;
-    case nfs:
-        mr_asprintf(output, "nfs");
+    case netfs:
+        mr_asprintf(output, "netfs");
         break;
     case tape:
@@ -1298 +1298 @@
     mr_free(tmp);
 
-    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == nfs) {
+    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == netfs) {
         // BERLIOS --- I'm tempted to do something about this...
         // Why unmount and remount again and again?
@@ -1310 +1310 @@
         mr_free(tmp);
 
-        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 ISO file name. Please report to dev team");
         }
-        if (bkpinfo->nfs_remote_dir) {
-            // NFS
-            mr_asprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
+        if (bkpinfo->netfs_remote_dir) {
+            // NETFS
+            mr_asprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
         } else {
             // ISO
@@ -1322 +1322 @@
         if (!does_file_exist(tmp)) {
             mr_free(tmp);
-            if (bkpinfo->nfs_remote_dir) {
-                // NFS
-                mr_asprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
+            if (bkpinfo->netfs_remote_dir) {
+                // NETFS
+                mr_asprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
             } else {
                 // ISO
@@ -1413 +1413 @@
     bkpinfo->nonbootable_backup = FALSE;
 
-    // Tape, CD, NFS, ...?
+    // Tape, CD, NETFS, ...?
     srandom(getpid());
     bkpinfo->backup_media_type =
@@ -1647 +1647 @@
 
 
-    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 == NULL) {
-            mr_asprintf(bkpinfo->nfs_mount, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        /* Initiate bkpinfo netfs_mount path from running environment if not already done */
+        if (bkpinfo->netfs_mount == NULL) {
+            mr_asprintf(bkpinfo->netfs_mount, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -1661 +1661 @@
 #endif
         {
-            p = popup_and_get_string("NFS 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);
+            p = popup_and_get_string("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->netfs_mount);
             if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            mr_free(bkpinfo->nfs_mount);
-            bkpinfo->nfs_mount = p;
+            mr_free(bkpinfo->netfs_mount);
+            bkpinfo->netfs_mount = p;
             if (!bkpinfo->restore_data) {
                 if ((bkpinfo->compression_level =
@@ -1677 +1677 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            mr_strip_spaces(bkpinfo->nfs_mount);
-            if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
-                bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
-            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->nfs_mount);
+            mr_strip_spaces(bkpinfo->netfs_mount);
+            if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
+                bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
+            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->netfs_mount);
             mr_free(bkpinfo->isodir);
             mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(command));
@@ -1711 +1711 @@
             mr_free(command);
 
-            p = popup_and_get_string("NFS share", "Which remote NFS share should I mount?", bkpinfo->nfs_mount);
+            p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount);
             if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            mr_free(bkpinfo->nfs_mount);
-            bkpinfo->nfs_mount = p;
+            mr_free(bkpinfo->netfs_mount);
+            bkpinfo->netfs_mount = p;
         }
         /* Initiate bkpinfo isodir path from running environment if mount already done */
         mr_free(bkpinfo->isodir);
-        if (is_this_device_mounted(bkpinfo->nfs_mount)) {
+        if (is_this_device_mounted(bkpinfo->netfs_mount)) {
             mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
 
         } else {
-            mr_asprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
+            mr_asprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
             mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
@@ -1731 +1731 @@
 
             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);
@@ -1741 +1749 @@
             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);
         }
-        p = popup_and_get_string("Directory", "Which directory within that mountpoint?", bkpinfo->nfs_remote_dir);
+        p = popup_and_get_string("Directory", "Which directory within that mountpoint?", bkpinfo->netfs_remote_dir);
         if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        mr_free(bkpinfo->nfs_remote_dir);
-        bkpinfo->nfs_remote_dir = p;
+        mr_free(bkpinfo->netfs_remote_dir);
+        bkpinfo->netfs_remote_dir = p;
 
         // check whether writable - we better remove surrounding spaces for this
-        mr_strip_spaces(bkpinfo->nfs_remote_dir);
+        mr_strip_spaces(bkpinfo->netfs_remote_dir);
 
         p = popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
@@ -1765 +1773 @@
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
 
-        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;
@@ -1873 +1881 @@
         bkpinfo->include_paths = p;
 
-        mr_asprintf(tmp, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(tmp, "%s", list_of_NETFS_mounts_only());
         if (strlen(tmp) > 2) {
             mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
@@ -1946 +1954 @@
 
     if (bkpinfo->backup_media_type == iso
-        || bkpinfo->backup_media_type == nfs) {
+        || bkpinfo->backup_media_type == netfs) {
         g_ISO_restore_mode = TRUE;
     }
@@ -1952 +1960 @@
 // skip
 #else
-    if (bkpinfo->backup_media_type == nfs) {
-        log_msg(3, "I think the NFS mount is mounted at %s", bkpinfo->isodir);
+    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);
-    if (bkpinfo->nfs_mount) {
-        log_it("nfs_mount = '%s'", bkpinfo->nfs_mount);
-    }
-    if (bkpinfo->nfs_user) {
-        log_it("nfs_user = '%s'", bkpinfo->nfs_user);
+    if (bkpinfo->netfs_mount) {
+        log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    }
+    if (bkpinfo->netfs_user) {
+        log_it("netfs_user = '%s'", bkpinfo->netfs_user);
+    }
+    if (bkpinfo->netfs_proto) {
+        log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
     }
 #endif
@@ -2008 +2019 @@
  */
 /**
- * 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;
@@ -2018 +2029 @@
     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);
@@ -2030 +2041 @@
 
 /**
- * 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);
@@ -2094 +2105 @@
     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
 
@@ -2535 +2546 @@
     struct stat buf;
 #endif
-    log_msg(0, "Looking for partition table format type");
     mr_asprintf(fdisk, "/sbin/parted2fdisk");
-    log_msg(1, "Using %s", fdisk);
     mr_asprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     mr_free(fdisk);