Changeset 1848 in MondoRescue

Timestamp:

Jan 4, 2008, 3:47:16 PM (17 years ago)

Author:

Bruno Cornec

Message:

Never tries to eject a NFS media (report from Brian McKee)

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-archive.c (modified) (3 diffs)
• common/libmondo-devices.c (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

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

@@ -3883 +3883 @@
     /*@ bool ******************************************************** */
     bool that_one_was_ok;
-    bool using_nfs;
     bool orig_vfy_flag_val;
 
@@ -3900 +3899 @@
     }
 
-    if (strlen(bkpinfo->nfs_mount) > 1) {
-        using_nfs = TRUE;
-    } else {
-        using_nfs = FALSE;
-    }
     log_msg(1, "OK, time to make %s #%d",
             media_descriptor_string(bkpinfo->backup_media_type),
@@ -3995 +3989 @@
         }
     }
-/*
-  if (using_nfs)
-    {
-      sprintf(tmp,"mv -f %s %s/%s/", isofile, bkpinfo->isodir, bkpinfo->nfs_remote_dir);
-      if (run_program_and_log_output(tmp, FALSE))
-        { log_to_screen("Unable to move ISO to NFS dir"); }
-    }
-*/
     g_current_media_number++;
     if (g_current_media_number > MAX_NOOF_MEDIA) {

branches/2.2.5/mondo/src/common/libmondo-devices.c

@@ -2129 +2129 @@
 
     case nfs:
+        /* Never try to eject a NFS device */
+        bkpinfo->please_dont_eject = TRUE;
+
         if (!bkpinfo->nfs_mount[0]) {
             strcpy(bkpinfo->nfs_mount,

branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c

@@ -661 +661 @@
     if (flag_set['n']) {
         bkpinfo->backup_media_type = nfs;
+        /* Never try to eject a NFS device */
+        bkpinfo->please_dont_eject = TRUE;
     }
     if (flag_set['r']) {

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

@@ -976 +976 @@
 } else if (!strcmp(value, "nfs")) {
     bkpinfo->backup_media_type = nfs;
+    bkpinfo->please_dont_eject = TRUE;
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
             strcpy(bkpinfo->prefix,value);