Changeset 1968


Ignore:
Timestamp:
May 29, 2008, 7:01:36 PM (11 years ago)
Author:
bruno
Message:
  • Call skip_obdr before extracting conf files
  • Do not call cdrecord for tape detection at restore time (removes /dev/nst0)
  • if using auto mode, do not ask for device type
  • sleep 10 s after usb-storage loading to let time to system to detect tape drive
Location:
branches/2.2.6
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.6/mindi/rootfs/sbin/init

    r1963 r1968  
    125125    tapedev="" ; # will be set by UntarTapeStuff()
    126126
    127     # Here we can add the USB stirage module, it's working !
     127    # Here we can add the USB storage module, it's working even with OBDR !
    128128    modprobe -q usb-storage
     129    # Tape takes some time to appear
     130    sleep 10
    129131    cd $GROOVY
    130132    UntarTapeStuff $tapedev
  • branches/2.2.6/mondo/src/common/libmondo-devices.c

    r1934 r1968  
    18341834    case tape:
    18351835
    1836         if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
     1836        if ((find_tape_device_and_size(bkpinfo->media_device, sz_size)) && (!bkpinfo->restore_mode)) {
    18371837            log_msg(3, "Ok, using vanilla scsi tape.");
    18381838            strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);
  • branches/2.2.6/mondo/src/common/libmondo-stream.c

    r1962 r1968  
    260260    char command[MAX_STR_LEN * 2];
    261261    char cdr_exe[MAX_STR_LEN];
    262 //  char tape_description_[MAX_STR_LEN];
    263 //  char tape_manufacturer_cdr[MAX_STR_LEN];
    264 //  FILE*fin;
    265262    int res;
    266263
     
    679676 * @param tapedev The tape device to open for reading.
    680677 */
    681 int skip_obdr()
     678int skip_obdr(void)
    682679{
    683680    char *command = NULL;
     
    704701 * EXISTING DATA on the tape!
    705702 */
    706 int create_obdr()
     703int create_obdr(void)
    707704{
    708705
  • branches/2.2.6/mondo/src/mondorestore/mondo-rstr-tools.c

    r1967 r1968  
    169169
    170170extern void kill_anything_like_this(char *str);
     171extern int skip_obdr(void);
    171172
    172173/**
     
    10171018        log_msg(2, tmp);
    10181019    } else if (bkpinfo->backup_media_type == tape
    1019             || bkpinfo->backup_media_type == udev) {
     1020            || bkpinfo->backup_media_type == udev) {
    10201021        if (read_cfg_var(cfg_file, "media-dev", value)) {
    10211022            fatal_error("Cannot get tape device name from cfg file");
     
    11341135    } else {
    11351136        read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
    1136                     bkpinfo->nfs_mount);
     1137                    bkpinfo->nfs_mount);
    11371138        read_cfg_var(g_mondo_cfg_file, "nfs-server-path",
    1138                     bkpinfo->nfs_remote_dir);
     1139                    bkpinfo->nfs_remote_dir);
    11391140        log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
    11401141        log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
    11411142    }
    11421143    if (strstr(call_program_and_get_last_line_of_output
    1143         ("cat /proc/cmdline"), "pxe")) {
    1144         /* We need to override values in PXE mode as it's 
     1144        ("cat /proc/cmdline"), "pxe")) {
     1145        /* We need to override values in PXE mode as it's
    11451146        * already done in start-nfs */
    11461147        envtmp1 = getenv("nfsmount");
     
    11871188            log_it("command = %s", command);
    11881189            log_it("res of it = %s",
    1189                 call_program_and_get_last_line_of_output(command));
     1190                call_program_and_get_last_line_of_output(command));
    11901191            sprintf(iso_mnt, "%s",
    11911192                    call_program_and_get_last_line_of_output(command));
     
    12261227            get_cfg_file_from_archive();
    12271228    /*
    1228         if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
     1229        if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
    12291230            { g_restoring_live_from_cd = FALSE; }
    12301231    */
     
    22182219    malloc_string(command);
    22192220
     2221    if (bkpinfo->use_obdr) {
     2222        skip_obdr();
     2223    }
    22202224    // tar -zxvf-
    22212225    sprintf(command,
  • branches/2.2.6/mondo/src/mondorestore/mondorestore.c

    r1967 r1968  
    4747
    4848extern int partition_everything(struct mountlist_itself *mountlist);
    49 
     49extern int handle_incoming_parameters(int argc, char *argv[]);
    5050
    5151/**
     
    268268    c = which_restore_mode();
    269269    iamhere("post wrm");
    270     if (c == 'I' || c == 'N' || c == 'C') {
     270    if (c == 'I' || c == 'C') {
    271271        interactively_obtain_media_parameters_from_user(FALSE);
    272272    } else {
     
    433433        }
    434434    }
    435    
     435
    436436#ifdef __FreeBSD__
    437437    if (strstr
Note: See TracChangeset for help on using the changeset viewer.