Changeset 1574 in MondoRescue

Timestamp:

Jul 26, 2007, 12:34:42 PM (18 years ago)

Author:

Bruno Cornec

Message:

More improvements on tape patch (/dev/st0 has to be the default)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-devices.c (modified) (4 diffs)
• common/libmondo-stream.c (modified) (4 diffs)
• include/my-stuff.h (modified) (1 diff)

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

@@ -1443 +1443 @@
     char *prompt = NULL;
     int i = 0;
+    int res = 0;
     FILE *fin = NULL;
 
@@ -1608 +1609 @@
     case tape:
 
-        if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
+        res = find_tape_device_and_size(bkpinfo->media_device, sz_size);
+        if ((res != 0) && (! bkpinfo->media_device[0])) {
             mr_msg(3, "Ok, using vanilla scsi tape.");
             strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);
@@ -1614 +1616 @@
                 paranoid_fclose(fin);
             } else {
-                strcpy(bkpinfo->media_device, "/dev/osst0");
+                mr_msg(2, "Don't know what your tape device is :-(");
             }
         }
@@ -1630 +1632 @@
                     bkpinfo->media_device);
             if (!ask_me_yes_or_no(tmp)) {
-                bkpinfo->media_device[0] = '\0';
                 if (!popup_and_get_string
                     ("Device name?",

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

@@ -290 +290 @@
     if (atoi(tmp) != 1) {
         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;
     }
@@ -311 +309 @@
     strcpy(dev, VANILLA_SCSI_TAPE);
     dev[strlen(dev) - 1] = '\0';
+    dev[strlen(dev) - 2] = '\0';
     strcat(dev, tmp);           // e.g. '/dev/st0' becomes '/dev/stN'
     res = 0;
@@ -319 +318 @@
             strcpy(dev, "/dev/osst0");
             if (!mt_says_tape_exists(dev)) {
+                // Stay with VANILLA_SCSI_TAPE
+                strcpy(dev, VANILLA_SCSI_TAPE);
                 res++;
             } else {
@@ -332 +333 @@
 grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | \
 awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'"));
-
-    if (mt_says_tape_exists(dev)) {
-        res = 0;
-    } else {
-        log_it("Turning %s", dev);
-        strcpy(tmp, (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
-        sprintf(dev, "/dev/os%s", tmp);
-        log_it("...into %s", dev);
-        if (mt_says_tape_exists(dev)) {
-            res = 0;
-        } else {
-            res++;
-        }
-    }
 
     siz[0] = '\0';

branches/stable/mondo/src/include/my-stuff.h

@@ -297 +297 @@
 #else
 #define VANILLA_SCSI_CDROM  "/dev/scd0"
-#define VANILLA_SCSI_TAPE   "/dev/st"
+#define VANILLA_SCSI_TAPE   "/dev/st0"
 #define VANILLA_USB_DEVICE  "/dev/sda"
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
 #define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs dos minix coda nfs ntfs hpfs raid lvm cifs"
-#define ALT_TAPE        "/dev/ht"
+#define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"
 #define CP_BIN      "cp"