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

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -614 +614 @@
     }
 
-    if (bkpinfo->backup_media_type == nfs) {
-        log_msg(2, "Mounting for NFS thingy");
+    if (bkpinfo->backup_media_type == netfs) {
+        log_msg(2, "Mounting for Network thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
         if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
@@ -624 +624 @@
 #ifdef __FreeBSD__
         sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+            bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
         sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+            bkpinfo->isodir, bkpinfo->netfs_remote_dir,
             bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
@@ -805 +805 @@
             strcpy(bkpinfo->prefix,STD_PREFIX);
     }
-} else if (!strcmp(value, "nfs")) {
-    bkpinfo->backup_media_type = nfs;
+} else if (!strcmp(value, "netfs")) {
+    bkpinfo->backup_media_type = netfs;
     bkpinfo->please_dont_eject = TRUE;
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
@@ -816 +816 @@
        ("cat /proc/cmdline"), "pxe")) {
         /* We need to override prefix value in PXE mode as it's 
-        * already done in start-nfs */
+        * already done in start-netfs */
         envtmp1 = getenv("imgname");
         if (envtmp1 == NULL) {
@@ -961 +961 @@
 }
 
-if (bkpinfo->backup_media_type == nfs) {
+if (bkpinfo->backup_media_type == netfs) {
     if (!cfgf) {
-        log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
-        log_msg(2, "nfs_remote_dir remains %s",
-                bkpinfo->nfs_remote_dir);
+        log_msg(2, "netfs_mount remains %s", bkpinfo->netfs_mount);
+        log_msg(2, "netfs_remote_dir remains %s",
+                bkpinfo->netfs_remote_dir);
         log_msg(2,
                 "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
     } else {
-        read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
-                    bkpinfo->nfs_mount);
-        read_cfg_var(g_mondo_cfg_file, "nfs-server-path",
-                    bkpinfo->nfs_remote_dir);
-        log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
-        log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
+        read_cfg_var(g_mondo_cfg_file, "netfs-server-mount",
+                    bkpinfo->netfs_mount);
+        read_cfg_var(g_mondo_cfg_file, "netfs-server-path",
+                    bkpinfo->netfs_remote_dir);
+        log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
+        log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
+        log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
     }
     if (strstr(call_program_and_get_last_line_of_output
         ("cat /proc/cmdline"), "pxe")) {
         /* We need to override values in PXE mode as it's
-        * already done in start-nfs */
-        envtmp1 = getenv("nfsmount");
+        * already done in start-netfs */
+        envtmp1 = getenv("netfsmount");
         if (envtmp1 == NULL) {
-            fatal_error("no nfsmount variable in environment");
+            fatal_error("no netfsmount variable in environment");
         }
         envtmp2 = getenv("dirimg");
@@ -988 +989 @@
             fatal_error("no dirimg variable in environment");
         }
-        strcpy(bkpinfo->nfs_mount,envtmp1);
-        strcpy(bkpinfo->nfs_remote_dir,envtmp2);
+        strcpy(bkpinfo->netfs_mount,envtmp1);
+        strcpy(bkpinfo->netfs_remote_dir,envtmp2);
     }
 } else if (bkpinfo->backup_media_type == iso) {