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

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

@@ -759 +759 @@
         mr_asprintf(value, "iso");
         break;
-    case nfs:
-        mr_asprintf(value, "nfs");
+    case netfs:
+        mr_asprintf(value, "netfs");
         break;
     case dvd:
@@ -824 +824 @@
     }
 
-    estimated_total_noof_slices =
-        size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-    /* BERLIOS: add nfs stuff here? */
+    estimated_total_noof_slices = size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
+
+    /* BERLIOS: add netfs stuff here? */
     mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
@@ -1218 +1218 @@
 
     if ((bkpinfo->isodir != NULL) && (bkpinfo->prefix != NULL)) {
-        if (bkpinfo->nfs_remote_dir) {
+        if (bkpinfo->netfs_remote_dir) {
             // NFS
-            mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix);
+            mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix);
         } else {
             // ISO
@@ -3131 +3131 @@
  * - @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
@@ -3203 +3203 @@
         log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.", (long) space_occupied_by_cd(bkpinfo->scratchdir), (long) bkpinfo->media_size[g_current_media_number]);
     }
-    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("Something wrong in your environement. Report to dev team");
     }
-    if (bkpinfo->nfs_remote_dir) {
-        // NFS
-        mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    if (bkpinfo->netfs_remote_dir) {
+        // Network
+        mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
     } else {
         // ISO
         mr_asprintf(isofile, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
     }
+
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         if (bkpinfo->backup_media_type != usb) {