Changeset 1934


Ignore:
Timestamp:
May 7, 2008, 3:08:46 PM (11 years ago)
Author:
bruno
Message:

Handle part of #250

Location:
branches/2.2.6/mondo/src
Files:
3 edited

Legend:

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

    r1919 r1934  
    16611661    bkpinfo->nonbootable_backup = FALSE;
    16621662
    1663 // Tape, CD, NFS, ...?
     1663    // Tape, CD, NFS, ...?
    16641664    srandom(getpid());
    16651665    bkpinfo->backup_media_type =
     
    16701670        finish(1);
    16711671    }
     1672    /* Why asking to remove the media with tape ?
    16721673    if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
    16731674        popup_and_OK("Please remove media from drive(s)");
    16741675    }
     1676    */
    16751677    log_msg(3, "media type = %s",
    16761678            bkptype_to_string(bkpinfo->backup_media_type));
     
    16851687    mvaddstr_and_log_it(2, 0, " ");
    16861688
    1687 // Find device's /dev (or SCSI) entry
     1689    // Find device's /dev (or SCSI) entry
    16881690    switch (bkpinfo->backup_media_type) {
    16891691    case cdr:
  • branches/2.2.6/mondo/src/common/libmondo-stream.c

    r1933 r1934  
    110110
    111111#define EXTRA_TAPE_CHECKSUMS
     112#define STR_HEADER  "Mondolicious, baby"
    112113
    113114/*@unused@*/
     
    11441145/*  for(*plen=0,i=7;i>=0;i--) {*plen<<=8; *plen |= tempblock[7001+i];} */
    11451146    memcpy((char *) plen, tempblock + 7001, sizeof(long long));
    1146     if (strcmp(tempblock + 6000 + *pcontrol_char, "Mondolicious, baby")) {
     1147    if (strcmp(tempblock + 6000 + *pcontrol_char, STR_HEADER)) {
    11471148        log_it("Bad header block at %ld K", (long) g_tape_posK);
    11481149    }
     
    13901391
    13911392    paranoid_pclose(g_tape_stream);
    1392     system("sync");
    1393     system("sync");
    1394     system("sync");
     1393    sync();
     1394    sync();
     1395    sync();
    13951396    log_it("Next tape requested.");
    13961397    insist_on_this_tape_number(g_current_media_number + 1); // will increment it, too
     
    17441745        tempblock[i] = 0;
    17451746    }
    1746     sprintf(tempblock + 6000 + control_char, "Mondolicious, baby");
     1747    sprintf(tempblock + 6000 + control_char, STR_HEADER);
    17471748    tempblock[7000] = control_char;
    17481749/*  for(i=0;i<8;i++) {tempblock[7001+i]=olen&0xff; olen>>=8;} */
  • branches/2.2.6/mondo/src/mondorestore/mondo-rstr-tools.c

    r1931 r1934  
    24032403                        ("Please reinsert the disk/CD and try again.");
    24042404                }
    2405                     /*
    2406             }
    2407                 */
    24082405        }
    24092406    }
Note: See TracChangeset for help on using the changeset viewer.