Changeset 2380 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-tools.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-tools.c (modified) (5 diffs)

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;