Changeset 1569 for branches/stable


Ignore:
Timestamp:
Jul 26, 2007, 1:18:38 AM (12 years ago)
Author:
bruno
Message:

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

Location:
branches/stable/mondo/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-devices.c

    r1548 r1569  
    16311631            if (!ask_me_yes_or_no(tmp)) {
    16321632                bkpinfo->media_device[0] = '\0';
     1633                if (!popup_and_get_string
     1634                    ("Device name?",
     1635                    "What is the /dev entry of your tape streamer?",
     1636                    bkpinfo->media_device, MAX_STR_LEN / 4)) {
     1637                    log_to_screen("User has chosen not to backup the PC");
     1638                    finish(1);
     1639                }
    16331640            }
    16341641            mr_free(tmp);
  • branches/stable/mondo/src/common/libmondo-raid.h

    r558 r1569  
    4040#else
    4141void add_disk_to_raid_device(struct list_of_disks *disklist,
    42                              char *device_to_add, int index);
     42                             char *device_to_add, int idx);
    4343#endif
    4444
  • branches/stable/mondo/src/common/libmondo-stream.c

    r1549 r1569  
    274274    int res;
    275275
     276    strcpy(dev, VANILLA_SCSI_TAPE);
    276277    log_to_screen("I am looking for your tape streamer. Please wait.");
     278    log_it("I am looking for your tape streamer. Please wait.");
     279    log_it("Taking %s as default",VANILLA_SCSI_TAPE);
    277280    dev[0] = siz[0] = '\0';
    278281    if (find_home_of_exe("cdrecord")) {
     
    286289    mr_free(command);
    287290    if (atoi(tmp) != 1) {
    288         log_it
    289             ("Either too few or too many tape streamers for me to detect...");
     291        log_it("Either too few or too many tape streamers for me to detect...");
     292        log_it("Taking %s",VANILLA_SCSI_TAPE);
    290293        strcpy(dev, VANILLA_SCSI_TAPE);
    291294        return 1;
     
    297300    mr_free(command);
    298301    if (strlen(tmp) < 2) {
    299         log_it("Could not find tape device");
     302        log_it("Could not check tape device with %s",cdr_exe);
    300303        return 1;
    301304    }
     
    314317        if (!mt_says_tape_exists(dev)) {
    315318            log_it("Cannot openin %s", dev);
    316             strcpy(dev, "/dev/st0");
     319            strcpy(dev, "/dev/osst0");
    317320            if (!mt_says_tape_exists(dev)) {
    318                 log_it("Cannot openin %s", dev);
    319                 strcpy(dev, "/dev/osst0");
    320                 if (!mt_says_tape_exists(dev)) {
    321                     res++;
    322                 } else {
    323                     res = 0;
    324                 }
     321                res++;
     322            } else {
     323                res = 0;
    325324            }
    326325        }
  • branches/stable/mondo/src/mondoarchive/mondo-cli.c

    r1549 r1569  
    386386        log_it("Hmm! No tape drive specified. Let's see what we can do.");
    387387        if (find_tape_device_and_size(flag_val['d'], tmp)) {
    388             fatal_error
    389                 ("Tape device not specified. I couldn't find it either.");
     388            log_to_screen
     389                ("Tape device not specified. I had problems to find it either");
    390390        }
    391391        flag_set['d'] = TRUE;
Note: See TracChangeset for help on using the changeset viewer.