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

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

@@ -373 +373 @@
  * - 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
@@ -657 +657 @@
     }                           // end of iso code
 
-    if (bkpinfo->backup_media_type == nfs) {
-        if (bkpinfo->nfs_mount) {
-            mr_asprintf(hostname, "%s", bkpinfo->nfs_mount);
+    if (bkpinfo->backup_media_type == netfs) {
+        if (bkpinfo->netfs_mount) {
+            mr_asprintf(hostname, "%s", bkpinfo->netfs_mount);
         } else {
-            log_it("nfs_mount is NULL");
+            log_it("netfs_mount is NULL");
             retval++;
             mr_asprintf(hostname, "");
@@ -667 +667 @@
         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 {
@@ -675 +675 @@
             hent = gethostbyname(hostname);
             if (!hent) {
-                log_it("Can't resolve NFS mount (%s): %s", hostname, hstrerror(h_errno));
+                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, ':'));
-                mr_free(bkpinfo->nfs_mount);
-                bkpinfo->nfs_mount = ip_address;
+                mr_strcat(ip_address, strchr(bkpinfo->netfs_mount, ':'));
+                mr_free(bkpinfo->netfs_mount);
+                bkpinfo->netfs_mount = ip_address;
             }
         }
         mr_free(hostname);
-        store_nfs_config();
+        store_netfs_config();
     }
 
@@ -797 +797 @@
     mr_free(bkpinfo->call_after_iso);
     mr_free(bkpinfo->kernel_path);
-    mr_free(bkpinfo->nfs_mount);
-    mr_free(bkpinfo->nfs_remote_dir);
-    mr_free(bkpinfo->nfs_user);
+    mr_free(bkpinfo->netfs_mount);
+    mr_free(bkpinfo->netfs_remote_dir);
+    mr_free(bkpinfo->netfs_user);
+    mr_free(bkpinfo->netfs_proto);
     mr_free(bkpinfo->postnuke_tarball);
 
@@ -855 +856 @@
     bkpinfo->call_after_iso = NULL;
     bkpinfo->kernel_path = NULL;
-    bkpinfo->nfs_mount = NULL;
-    bkpinfo->nfs_remote_dir = NULL;
-    bkpinfo->nfs_user = NULL;
+    bkpinfo->netfs_mount = NULL;
+    bkpinfo->netfs_remote_dir = NULL;
+    bkpinfo->netfs_user = NULL;
+    bkpinfo->netfs_proto = NULL;
     bkpinfo->postnuke_tarball = NULL;
     bkpinfo->wipe_media_first = FALSE;