Changeset 1574 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c

Timestamp:

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

Author:

Bruno Cornec

Message:

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

File:

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

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';