Changeset 1569 in MondoRescue

Timestamp:

Jul 26, 2007, 1:18:38 AM (18 years ago)

Author:

Bruno Cornec

Message:

Improvements on tape handling (based on patches from Michel Loiseleur <mloiseleur_at_linagora.com>)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-raid.h (modified) (1 diff)
• common/libmondo-stream.c (modified) (4 diffs)
• mondoarchive/mondo-cli.c (modified) (1 diff)

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

@@ -1631 +1631 @@
             if (!ask_me_yes_or_no(tmp)) {
                 bkpinfo->media_device[0] = '\0';
+                if (!popup_and_get_string
+                    ("Device name?",
+                    "What is the /dev entry of your tape streamer?",
+                    bkpinfo->media_device, MAX_STR_LEN / 4)) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
             }
             mr_free(tmp);

branches/stable/mondo/src/common/libmondo-raid.h

@@ -40 +40 @@
 #else
 void add_disk_to_raid_device(struct list_of_disks *disklist,
-                             char *device_to_add, int index);
+                             char *device_to_add, int idx);
 #endif
 

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

@@ -274 +274 @@
     int res;
 
+    strcpy(dev, VANILLA_SCSI_TAPE);
     log_to_screen("I am looking for your tape streamer. Please wait.");
+    log_it("I am looking for your tape streamer. Please wait.");
+    log_it("Taking %s as default",VANILLA_SCSI_TAPE);
     dev[0] = siz[0] = '\0';
     if (find_home_of_exe("cdrecord")) {
@@ -286 +289 @@
     mr_free(command);
     if (atoi(tmp) != 1) {
-        log_it
-            ("Either too few or too many tape streamers for me to detect...");
+        log_it("Either too few or too many tape streamers for me to detect...");
+        log_it("Taking %s",VANILLA_SCSI_TAPE);
         strcpy(dev, VANILLA_SCSI_TAPE);
         return 1;
@@ -297 +300 @@
     mr_free(command);
     if (strlen(tmp) < 2) {
-        log_it("Could not find tape device");
+        log_it("Could not check tape device with %s",cdr_exe);
         return 1;
     }
@@ -314 +317 @@
         if (!mt_says_tape_exists(dev)) {
             log_it("Cannot openin %s", dev);
-            strcpy(dev, "/dev/st0");
+            strcpy(dev, "/dev/osst0");
             if (!mt_says_tape_exists(dev)) {
-                log_it("Cannot openin %s", dev);
-                strcpy(dev, "/dev/osst0");
-                if (!mt_says_tape_exists(dev)) {
-                    res++;
-                } else {
-                    res = 0;
-                }
+                res++;
+            } else {
+                res = 0;
             }
         }

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

@@ -386 +386 @@
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
         if (find_tape_device_and_size(flag_val['d'], tmp)) {
-            fatal_error
-                ("Tape device not specified. I couldn't find it either.");
+            log_to_screen
+                ("Tape device not specified. I had problems to find it either");
         }
         flag_set['d'] = TRUE;