Changeset 2380 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c

Timestamp:

Sep 9, 2009, 8:30:47 PM (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)
• Better logging to detect a potential nuke issue

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (21 diffs)

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