Changeset 1969 in MondoRescue

Timestamp:

May 29, 2008, 7:36:58 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Change order of test do that when restoring, cdrecord is really not called ;-)
• mondoarchive already configures correctly the device name to non-rew so avoid doing it again at restore time
• Fix automatic mode handling which was exiting in fact.

Location:

branches/2.2.6/mondo/src

Files:

• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-stream.c (modified) (3 diffs)
• mondorestore/mondorestore.c (modified) (1 diff)

branches/2.2.6/mondo/src/common/libmondo-cli.c

@@ -534 +534 @@
     }
 
-    if (flag_set['t'] && !flag_set['d']) {
+    if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
         if (find_tape_device_and_size(flag_val['d'], tmp)) {

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

@@ -1834 +1834 @@
     case tape:
 
-        if ((find_tape_device_and_size(bkpinfo->media_device, sz_size)) && (!bkpinfo->restore_mode)) {
+        if ((!bkpinfo->restore_mode) && (find_tape_device_and_size(bkpinfo->media_device, sz_size))) {
             log_msg(3, "Ok, using vanilla scsi tape.");
             strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -748 +748 @@
     char fname[MAX_STR_LEN];
     char *datablock;
-    char *ntapedev = NULL;
     char tmp[MAX_STR_LEN];
     char old_cwd[MAX_STR_LEN];
@@ -779 +778 @@
         return (0);
     }
-    ntapedev = get_non_rewind_dev(bkpinfo->media_device);
-    if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
-        strncpy(bkpinfo->media_device,ntapedev,(size_t)(MAX_STR_LEN / 4));
+
+    // mondoarchive should have configured everything to give the right non-rew device
+    if ((bkpinfo->use_obdr) && (bkpinfo->media_device != NULL)) {
         res = skip_obdr();
         if (res != 0) {
@@ -787 +786 @@
         }
     } else {
-        if (ntapedev == NULL) {
+        if (bkpinfo->media_device == NULL) {
             log_it("Not able to skip OBDR - Restore will have to be done manually");
         }
         set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
     }
-    paranoid_free(ntapedev);
 
     insist_on_this_tape_number(1);

branches/2.2.6/mondo/src/mondorestore/mondorestore.c

@@ -270 +270 @@
     if (c == 'I' || c == 'C') {
         interactively_obtain_media_parameters_from_user(FALSE);
+    } else if (c == 'N') {
+        // Auto mode nothing special to do
     } else {
         popup_and_OK("No restoring or comparing will take place today.");