Changeset 1903 in MondoRescue for branches/stable/mondo/src/common/libmondo-devices.c

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

File:

• branches/stable/mondo/src/common/libmondo-devices.c (modified) (4 diffs)

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

@@ -1576 +1576 @@
     }
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
-        popup_and_OK(_("Please remove CD from drive"));
+        popup_and_OK(_("Please remove media from drive"));
     }
     mr_msg(3, "media type = %s",
@@ -1804 +1804 @@
 
     case nfs:
+        /* Never try to eject a NFS device */
+        bkpinfo->please_dont_eject = TRUE;
+
+        /* Initiate bkpinfo nfs_mount path from running environment if not already done */
         if (!bkpinfo->nfs_mount[0]) {
             strcpy(bkpinfo->nfs_mount,
@@ -1840 +1844 @@
             mr_free(command);
 
-            mr_asprintf(&comment,
+            if (!bkpinfo->restore_data) {
+                mr_asprintf(&comment,
                     _("How much data (in Megabytes) will each media store?"));
-            if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
-                finish(1);
+                if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
+                    log_to_screen(_("User has chosen not to backup the PC"));
+                    finish(1);
+                }
+            } else {
+                sz_size = 0;
             }
             mr_free(comment);
@@ -1863 +1871 @@
             }
         }
-        if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
+        /* Initiate bkpinfo isodir path from running environment if mount already done */
+        if (is_this_device_mounted(bkpinfo->nfs_mount)) {
+            strcpy(bkpinfo->isodir,
+                   call_program_and_get_last_line_of_output
+                   ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
+        } else {
             sprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
             mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);