Changeset 1770 in MondoRescue for branches/stable/mondo


Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (16 years ago)
Author:
Bruno Cornec
Message:
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

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

Legend:

Unmodified
Added
Removed

  • branches/stable/mondo/src/common/libmondo-archive.c

    r1769 r1770  
    929929                    bkpinfo->tmpdir, bkpinfo->scratchdir);
    930930            if (system(command)) {
    931                 fatal_error("Unable to create temporary duff tarball");
     931                fatal_error("Unable to create temporary all tarball");
    932932            }
    933933            mr_free(command);
    … …  
    936936/* BERLIOS: Not executed ?
    937937        sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
     938*/
     939        /* For USB we already have everything on the key */
     940        if (bkpinfo->backup_media_type == usb) {
     941            mr_asprintf(&command, "rm -rf %s/images", bkpinfo->scratchdir);
     942            run_program_and_log_output(command, FALSE);
     943            mr_free(command);
     944        } else {
     945            mr_asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
    938946                bkpinfo->tmpdir, bkpinfo->scratchdir);
    939 */
    940         mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
     947            if (system(command)) {
     948                mr_msg(2, "Unable to copy mindi images");
     949            }
     950            mr_free(command);
     951
     952            mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
    941953                 bkpinfo->scratchdir, bkpinfo->tmpdir);
    942         if (system(tmp)) {
    943             fatal_error("Cannot find all.tar.gz in tmpdir");
    944         }
    945         mr_free(tmp);
     954            if (system(tmp)) {
     955                fatal_error("Cannot find all.tar.gz in tmpdir");
     956            mr_free(tmp);
     957            }
     958        }
    946959
    947960        if (res) {
    … …  
    11621175                        "Writing any remaining data to media         ");
    11631176
    1164     mr_msg(1, "Closing tape/CD ... ");
     1177    mr_msg(1, "Closing tape/CD/USB ... ");
    11651178    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    11661179        /* write tape/cdstream */
    … …  
    12491262        write_data_disks_to_stream(data_disks_file);
    12501263    } else {
    1251         mr_msg(1, "Backing up to CD's");
     1264        if (bkpinfo->backup_media_type == usb) {
     1265            mr_msg(1, "Backing up to USB's");
     1266        } else {
     1267            mr_msg(1, "Backing up to CD's");
     1268        }
    12521269    }
    12531270    mr_free(data_disks_file);
    … …  
    15741591    log_msg(1, message_to_screen);
    15751592
    1576     if (is_this_device_mounted(bkpinfo->media_device)) {
     1593    asprintf(&tmp1, "%s1", bkpinfo->media_device);
     1594    if (is_this_device_mounted(tmp1)) {
    15771595        log_msg(1, "USB device mounted. Remounting it at the right place");
    1578         asprintf(&tmp, "umount %s", bkpinfo->media_device);
     1596        asprintf(&tmp, "umount %s", tmp1);
    15791597        run_program_and_log_output(tmp, FALSE);
    15801598        paranoid_free(tmp);
    15811599    }
     1600    paranoid_free(tmp);
     1601
    15821602    log_msg(1, "Mounting USB device.");
    15831603    asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
    … …  
    15961616
    15971617        /* Command to execute */
    1598         asprintf(&tmp,"mv %s/.??* %s/* %s", bkpinfo->scratchdir, bkpinfo->scratchdir, tmp1);
     1618        asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1);
    15991619        res = eval_call_to_make_USB(tmp, message_to_screen);
    16001620        if (res) {
    … …  
    32623282                 media_descriptor_string(g_backup_media_type));
    32633283            chdir("/");
    3264             iamhere("Before calling verify_cd_image()");
    3265             res += verify_cd_image();
    3266             iamhere("After calling verify_cd_image()");
     3284            iamhere("Before calling verification of image()");
     3285            if (bkpinfo->backup_media_type == usb) {
     3286                res += verify_usb_image();
     3287            } else {
     3288                res += verify_cd_image();
     3289            }
     3290            iamhere("After calling verification of image()");
    32673291        }
    32683292        if (!res) {
    … …  
    32993323
    33003324    if (last_cd) {
    3301         mr_msg(2, "This was your last CD.");
     3325        mr_msg(2, "This was your last media.");
    33023326    } else {
    33033327        mr_msg(2, "Continuing to backup your data...");
    … …  
    33403364        mr_msg(2,
    33413365                "Not verifying again. Per-CD/ISO verification already carried out.");
    3342         sprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MINDI_CACHE);
     3366        sprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MONDO_CACHE);
    33433367        paranoid_system(tmp);
    33443368    } else {
    … …  
    33693393        mr_asprintf(&tmp,
    33703394                "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
    3371                 MONDO_LOGFILE, MINDI_CACHE);
     3395                MONDO_LOGFILE, MONDO_CACHE);
    33723396        system(tmp);
    33733397        mr_free(tmp);
    … …  
    33753399        mr_asprintf(&tmp,
    33763400                "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
    3377                 MONDO_LOGFILE, MINDI_CACHE);
     3401                MONDO_LOGFILE, MONDO_CACHE);
    33783402        system(tmp);
    33793403        mr_free(tmp);
    … …  
    33823406        eject_device(bkpinfo->media_device);
    33833407    }
    3384     sprintf(tmp, "%s/changed.files", MINDI_CACHE);
     3408    sprintf(tmp, "%s/changed.files", MONDO_CACHE);
    33853409    diffs = count_lines_in_file(tmp);
    33863410

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

    r1769 r1770  
    4545
    4646extern bool g_ISO_restore_mode;
    47 extern char *g_erase_tmpdir_and_scratchdir;
    4847extern char *g_selfmounted_isodir;
    4948extern char *MONDO_LOGFILE;
    … …  
    555554}
    556555
    557 
    558 /**
    559  * Locate a CD-R/W writer's SCSI node.
    560  * @param cdrw_device SCSI node will be placed here.
    561  * @return 0 for success, nonzero for failure.
    562  */
    563556
    564557
    … …  
    13151308
    13161309/**
     1310 * Mount the CD-ROM at @p mountpoint.
     1311 * @param device The device (or file if g_ISO_restore_mode) to mount.
     1312 * @param mountpoint The place to mount it.
     1313 * @return 0 for success, nonzero for failure.
     1314 */
     1315int mount_USB_here(char *device, char *mountpoint)
     1316{
     1317    /*@ buffer ****************************************************** */
     1318    char *command;
     1319    char *dev;
     1320    int retval;
     1321
     1322    malloc_string(command);
     1323    malloc_string(dev);
     1324    assert_string_is_neither_NULL_nor_zerolength(device);
     1325    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
     1326
     1327    make_hole_for_dir(mountpoint);
     1328    if (isdigit(device[0])) {
     1329        return(1);
     1330    } else {
     1331        strcpy(dev, device);
     1332    }
     1333    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device,
     1334            mountpoint);
     1335
     1336#ifdef __FreeBSD__
     1337    sprintf(command, "mount_vfat %s %s 2>> %s",
     1338            device, mountpoint, MONDO_LOGFILE);
     1339
     1340#else
     1341    sprintf(command, "mount %s -t vfat %s 2>> %s",
     1342            device, mountpoint, MONDO_LOGFILE);
     1343#endif
     1344
     1345    log_msg(4, command);
     1346    retval = system(command);
     1347    log_msg(1, "system(%s) returned %d", command, retval);
     1348
     1349    paranoid_free(command);
     1350    paranoid_free(dev);
     1351    return (retval);
     1352}
     1353
     1354/**
     1355 * Mount the CD-ROM at @p mountpoint.
     1356 * @param device The device (or file if g_ISO_restore_mode) to mount.
     1357 * @param mountpoint The place to mount it.
     1358 * @return 0 for success, nonzero for failure.
     1359 */
     1360int mount_CDROM_here(char *device, char *mountpoint)
     1361{
     1362    /*@ buffer ****************************************************** */
     1363    char *command;
     1364    char *dev;
     1365    char *options;
     1366    int retval;
     1367
     1368    malloc_string(command);
     1369    malloc_string(dev);
     1370    malloc_string(options);
     1371    assert_string_is_neither_NULL_nor_zerolength(device);
     1372    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
     1373
     1374    make_hole_for_dir(mountpoint);
     1375    strcpy(options, "ro");
     1376    if (isdigit(device[0])) {
     1377        find_cdrom_device(device, FALSE);
     1378    } else {
     1379        strcpy(dev, device);
     1380    }
     1381    if (g_ISO_restore_mode) {
     1382
     1383#ifdef __FreeBSD__
     1384        strcpy(dev, make_vn(device));
     1385        if (!dev) {
     1386            sprintf(command, "Unable to mount ISO (make_vn(%s) failed)",
     1387                    device);
     1388            fatal_error(command);
     1389        }
     1390        strcpy(device, dev);
     1391#else
     1392        strcat(options, ",loop");
     1393#endif
     1394
     1395    }
     1396    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
     1397            mountpoint);
     1398    /*@ end vars *************************************************** */
     1399
     1400#ifdef __FreeBSD__
     1401    sprintf(command, "mount_cd9660 -r %s %s 2>> %s",
     1402            device, mountpoint, MONDO_LOGFILE);
     1403
     1404#else
     1405    sprintf(command, "mount %s -o %s -t iso9660 %s 2>> %s",
     1406            device, options, mountpoint, MONDO_LOGFILE);
     1407#endif
     1408
     1409    log_msg(4, command);
     1410    if (strncmp(device, "/dev/", 5) == 0) {
     1411        retract_CD_tray_and_defeat_autorun();
     1412    }
     1413    retval = system(command);
     1414    log_msg(1, "system(%s) returned %d", command, retval);
     1415
     1416    paranoid_free(command);
     1417    paranoid_free(dev);
     1418    paranoid_free(options);
     1419    return (retval);
     1420}
     1421
     1422
     1423
     1424
     1425
     1426
     1427/**
    13171428 * Ask the user for CD number @p cd_number_i_want.
    13181429 * Sets g_current_media_number once the correct CD is inserted.
    … …  
    14431554{
    14441555    char *tmp = NULL;
     1556    char *tmp1 = NULL;
    14451557    char *sz_size = NULL;
    14461558    char *command = NULL;
    … …  
    14801592    case dvd:
    14811593    case usb:
     1594        /* Never try to eject a USB device */
     1595        if (bkpinfo->backup_media_type == usb) {
     1596            bkpinfo->please_dont_eject = TRUE;
     1597        }
    14821598        if (archiving_to_media) {
    14831599            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
    … …  
    15561672            }
    15571673        }
    1558 
     1674        /* No break because we continue even for usb */
    15591675    case cdstream:
    1560         if (bkpinfo->disaster_recovery) {
     1676        if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
    15611677            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
    15621678            mr_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
    1563         } else if (bkpinfo->restore_data || bkpinfo->backup_media_type == dvd) {
     1679        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))
     1680                   || bkpinfo->backup_media_type == dvd) {
    15641681            if (!bkpinfo->media_device) {
    15651682                mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
    … …  
    15821699                    bkpinfo->media_device);
    15831700        } else {
     1701<<<<<<< .courant
    15841702            mr_asprintf(&comment, _("What is your media device ?"));
    15851703            mr_asprintf(&tmp, mr_conf->media_device);
    … …  
    15881706                log_to_screen(_("User has chosen not to backup the PC"));
    15891707                finish(1);
    1590             }
     1708=======
     1709            if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
     1710                bkpinfo->media_device[0] = '\0';
     1711>>>>>>> .fusion-droit.r1769
     1712            }
     1713<<<<<<< .courant
    15911714            mr_free(comment);
    15921715
    … …  
    16021725                if (!popup_and_get_string("Device", comment, tmp, 5)) {
    16031726                    log_to_screen(_("User has chosen not to backup the PC"));
     1727=======
     1728            if (bkpinfo->media_device[0]) {
     1729                if (bkpinfo->backup_media_type == usb) {
     1730                    sprintf(tmp,
     1731                        "I think your %s media corresponds to %s. Is this correct?",
     1732                        media_descriptor_string(bkpinfo->backup_media_type),
     1733                        bkpinfo->media_device);
     1734                } else {
     1735                    sprintf(tmp,
     1736                        "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
     1737                        media_descriptor_string(bkpinfo->backup_media_type),
     1738                        bkpinfo->media_device);
     1739                }
     1740                if (!ask_me_yes_or_no(tmp)) {
     1741                    bkpinfo->media_device[0] = '\0';
     1742                }
     1743            }
     1744            if (!bkpinfo->media_device[0]) {
     1745                if (bkpinfo->backup_media_type == usb) {
     1746                    i = popup_and_get_string("/dev entry?",
     1747                                         "What is the /dev entry of your USB Disk/Key, please?",
     1748                                         bkpinfo->media_device,
     1749                                         MAX_STR_LEN / 4);
     1750                } else {
     1751                    if (g_kernel_version < 2.6) {
     1752                        i = popup_and_get_string("Device node?",
     1753                                             "What is the SCSI node of your CD (re)writer, please?",
     1754                                             bkpinfo->media_device,
     1755                                             MAX_STR_LEN / 4);
     1756                    } else {
     1757                        i = popup_and_get_string("/dev entry?",
     1758                                             "What is the /dev entry of your CD (re)writer, please?",
     1759                                             bkpinfo->media_device,
     1760                                             MAX_STR_LEN / 4);
     1761                    }
     1762                }
     1763                if (!i) {
     1764                    log_to_screen("User has chosen not to backup the PC");
     1765>>>>>>> .fusion-droit.r1769
    16041766                    finish(1);
    16051767                }
    … …  
    17701932        // check whether writable - we better remove surrounding spaces for this
    17711933        mr_strip_spaces(bkpinfo->nfs_remote_dir);
    1772         mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
    1773                 bkpinfo->nfs_remote_dir);
     1934        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
     1935        mr_asprintf(&command, "echo hi > '%s'", tmp1);
    17741936        while (run_program_and_log_output(command, FALSE)) {
    17751937            mr_asprintf(&tmp, bkpinfo->nfs_remote_dir);
    … …  
    17881950            // check whether writable - we better remove surrounding space s for this
    17891951            mr_strip_spaces(bkpinfo->nfs_remote_dir);
     1952            paranoid_free(tmp1);
     1953            mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
    17901954
    17911955            mr_free(command);
    1792             mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
    1793                     bkpinfo->nfs_remote_dir);
     1956            mr_asprintf(&command, "echo hi > '%s'", tmp1);
    17941957        }
    17951958        mr_free(command);
     1959        unlink(tmp1);
     1960        paranoid_free(tmp1);
    17961961
    17971962        mr_asprintf(&tmp, mr_conf->prefix);
    … …  
    21832348    mr_asprintf(&mountdev, bkpinfo->media_device);
    21842349    if (!is_this_device_mounted(MNT_CDROM)) {
    2185         mount_CDROM_here(mountdev, MNT_CDROM);
     2350        if (bkpinfo->backup_media_type == usb) {
     2351            mount_USB_here(mountdev, MNT_CDROM);
     2352        } else {
     2353            mount_CDROM_here(mountdev, MNT_CDROM);
     2354        }
    21862355    }
    21872356    cd_number =

  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1670 r1770  
    15151515                       char *userdef_filelist)
    15161516{
    1517     char sz_datefile_wildcard[] = "/var/cache/mondo-archive/difflevel.%d";
     1517    char sz_datefile_wildcard[] = MONDO_CACHE"/difflevel.%d";
    15181518    char *p = NULL;
    15191519    char *q = NULL;
    … …  
    15891589        mr_msg(2, "include_paths = '%s'", include_paths);
    15901590        mr_msg(1, "Calculating filelist");
    1591         snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s . .. \
     1591        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s %s . .. \
    15921592" MNT_CDROM " /mnt/floppy /media \
    15931593/proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);

  • branches/stable/mondo/src/common/libmondo-tools.c

    r1769 r1770  
    3232
    3333extern int g_tape_buffer_size_MB;
    34 extern char *g_erase_tmpdir_and_scratchdir;
    3534extern char *g_serial_string;
    3635extern bool g_text_mode;
    … …  
    653652    }
    654653
    655     asprintf(&tmp,"rm -Rf %s/changed.files*",MINDI_CACHE);
     654    asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE);
    656655    run_program_and_log_output(tmp, FALSE);
    657656    paranoid_free(tmp);
    … …  
    798797    assert_string_is_neither_NULL_nor_zerolength(partition);
    799798
    800     mr_asprintf(&command, "df -m -P %s &> /dev/null", partition);
     799    mr_asprintf(&command, "df -m -P %s 1> /dev/null 2> /dev/null", partition);
    801800    if (system(command)) {
    802801        return (-1);
    … …  
    838837    /*@ int's *************** */
    839838    int retval = 0;
    840     long Lres;
    841 
    842839
    843840    mvaddstr_and_log_it(g_currentY, 0,
    844841                        "Checking sanity of your Linux distribution");
    845842#ifndef __FreeBSD__
    846     if (system("which mkfs.vfat &> /dev/null")
    847         && !system("which mkfs.msdos &> /dev/null")) {
     843    if (system("which mkfs.vfat 2> /dev/null 1> /dev/null")
     844        && !system("which mkfs.msdos 2> /dev/null 1> /dev/null")) {
    848845        log_it
    849846            ("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand...");
    … …  
    12251222        malloc_string(g_boot_mountpt);
    12261223        malloc_string(g_tmpfs_mountpt);
    1227         malloc_string(g_erase_tmpdir_and_scratchdir);
    12281224        malloc_string(g_serial_string);
    12291225        malloc_string(g_magicdev_command);
    … …  
    12311227        mr_free(g_boot_mountpt);
    12321228        mr_free(g_tmpfs_mountpt);
    1233         mr_free(g_erase_tmpdir_and_scratchdir);
    12341229        mr_free(g_serial_string);
    12351230        mr_free(g_magicdev_command);

  • branches/stable/mondo/src/common/libmondo-verify-EXT.h

    r1663 r1770  
    33
    44extern int verify_cd_image();
     5extern int verify_usb_image();
    56extern int verify_a_tarball(char *);
    67extern int verify_an_afioball_from_CD(char *);

  • branches/stable/mondo/src/common/libmondo-verify.c

    r1769 r1770  
    879879
    880880/**
     881 * Verify the USB device
     882 * @param bkpinfo The backup information structure. Fields used:
     883 * - @c bkpinfo->isodir
     884 * - @c bkpinfo->media_device
     885 * - @c bkpinfo->tmpdir
     886 * - @c bkpinfo->verify_data
     887 *
     888 * @return 0 for success (even if differences are found), nonzero for failure.
     889 * @ingroup verifyGroup
     890 */
     891int verify_usb_image()
     892{
     893
     894    /*@ int ************************************************************ */
     895    int retval = 0;
     896
     897    /*@ buffers ******************************************************** */
     898    char *mountpoint = NULL;
     899    char *tmp = NULL;
     900    char *tmp1 = NULL;
     901    char *fname = NULL;
     902    int ret = 0;
     903#ifdef __FreeBSD__
     904    char mdd[32];
     905    char *mddevice = mdd;
     906    int vndev = 2;
     907#else
     908//skip
     909#endif
     910
     911    assert(bkpinfo != NULL);
     912
     913    asprintf(&fname, "%s1", bkpinfo->media_device);
     914    if (is_this_device_mounted(fname)) {
     915        log_msg(1, "USB device mounted. Remounting it at the right place");
     916        asprintf(&tmp, "umount %s", fname);
     917        run_program_and_log_output(tmp, FALSE);
     918        paranoid_free(tmp);
     919    }
     920    paranoid_free(fname);
     921
     922    log_msg(1, "Mounting USB device.");
     923    asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
     924    asprintf(&tmp, "mkdir -p %s", mountpoint);
     925    run_program_and_log_output(tmp, FALSE);
     926    paranoid_free(tmp);
     927    /* Mindi always create one single parition on the USB dev */
     928    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
     929    ret = run_program_and_log_output(tmp, FALSE);
     930    paranoid_free(tmp);
     931    if (ret) {
     932        paranoid_free(mountpoint);
     933        return(ret);
     934    }
     935
     936    sync();
     937    log_msg(2, "OK, I've mounted the USB Disk/Key\n");
     938    asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     939    if (!does_file_exist(tmp)) {
     940        log_msg
     941            (2,
     942             "This is the last USB device. I am therefore setting bkpinfo->verify_data to FALSE.");
     943        bkpinfo->verify_data = FALSE;
     944/*
     945   (a) It's an easy way to tell the calling subroutine that we've finished &
     946   there are no more device to be verified; (b) It stops the post-backup verifier
     947   from running after the per-device verifier has run too.
     948*/
     949    }
     950    paranoid_free(tmp);
     951    verify_afioballs_on_CD(mountpoint);
     952    iamhere("before verify_all_slices");
     953    verify_all_slices_on_CD(mountpoint);
     954
     955    asprintf(&tmp1, "umount %s", mountpoint);
     956#ifdef __FreeBSD__
     957    ret += system(tmp1);
     958    ret += kick_vn(mddevice);
     959    if (ret)
     960#else
     961    if (system(tmp1))
     962#endif
     963    {
     964        asprintf(&tmp, "%s failed; unable to unmount USB device\n", tmp1);
     965        log_to_screen(tmp);
     966        paranoid_free(tmp);
     967        retval++;
     968    } else {
     969        log_msg(2, "OK, I've unmounted the USB device\n");
     970    }
     971    paranoid_free(tmp1);
     972    paranoid_free(mountpoint);
     973    return (retval);
     974}
     975
     976
     977/**
    881978 * Verify the CD indicated by @c g_current_media_number.
    882979 * @param bkpinfo The backup information structure. Fields used:
    … …  
    10841181    diffs = count_lines_in_file(changed_files_fname);
    10851182    if (diffs > 0) {
    1086         mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname, MINDI_CACHE);
     1183        mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname, MONDO_CACHE);
    10871184        run_program_and_log_output(tmp, FALSE);
    10881185        mr_free(tmp);
    … …  
    10901187        mr_asprintf(&tmp,
    10911188                 "%ld files differed from live filesystem; type less %s or less %s/changed.files to see",
    1092                  diffs, changed_files_fname, MINDI_CACHE);
     1189                 diffs, changed_files_fname, MONDO_CACHE);
    10931190        mr_msg(0, tmp);
    10941191        mr_free(tmp);
    10951192
    10961193        log_to_screen
    1097             (_("See "MINDI_CACHE"/changed.files for a list of nonmatching files."));
     1194            (_("See "MONDO_CACHE"/changed.files for a list of nonmatching files."));
    10981195        log_to_screen
    10991196            (_("The files probably changed on filesystem, not on backup media."));
    1100         //      retval++;
    11011197    }
    11021198    mr_free(changed_files_fname);

  • branches/stable/mondo/src/common/libmondo-verify.h

    r1663 r1770  
    6363
    6464int verify_cd_image();
     65int verify_usb_image();
    6566int verify_a_tarball(char *);
    6667int verify_an_afioball_from_CD(char *);

  • branches/stable/mondo/src/common/newt-specific.c

    r1670 r1770  
    105105     g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
    106106bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
    107 char *g_erase_tmpdir_and_scratchdir = NULL; ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
    108107char *g_selfmounted_isodir = NULL;  ///< Holds the NFS mountpoint if mounted via mondoarchive.
    109108
    … …  
    326325    }
    327326
    328     if (g_erase_tmpdir_and_scratchdir[0]) {
    329         run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
    330     }
    331 
    332327    if (g_selfmounted_isodir) {
    333328        mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
    … …  
    373368    run_program_and_log_output("rm -Rf /mondo.scratch.* /tmp.mondo.*",
    374369                                   FALSE);
    375     if (g_erase_tmpdir_and_scratchdir) {
    376         run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
    377     }
    378370    if (g_selfmounted_isodir) {
    379371        mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
    … …  
    396388    printf("Execution run ended; result=%d\n", signal_code);
    397389    printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
     390    mr_asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
     391    system(command);
     392    paranoid_free(command);
     393    paranoid_free(bkpinfo);
    398394    free_libmondo_global_strings();
    399395    mr_exit(signal_code, "Execution run ended");
    … …  
    11901186    b2 = newtButton(17, 1, _("CD-RW disks"));
    11911187    b3 = newtButton(1, 9, _("Tape drive "));
    1192     b4 = newtButton(17, 5, _("CD streamer"));
     1188    b4 = newtButton(17, 5, _("USB Key/Disk"));
    11931189    b5 = newtButton(1, 5, _(" DVD disks "));
    11941190    b6 = newtButton(17, 9, _(" NFS mount "));

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

    r1693 r1770  
    8787 */
    8888#define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt"
     89
     90/**
     91 * The location where mondo changed info are stored.
     92 */
     93#define MONDO_CACHE "/var/cache/mondo"
    8994
    9095/**

  • branches/stable/mondo/src/mondoarchive/mondo-cli.c

    r1769 r1770  
    488488    if (flag_set['U']) {
    489489        bkpinfo->backup_media_type = usb;
     490        /* Never try to eject a USB device */
     491        bkpinfo->please_dont_eject = TRUE;
    490492    }
    491493    if (flag_set['z']) {
    … …  
    618620            strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
    619621            mr_asprintf(&tmp2, "ls -l %s", bkpinfo->isodir);
    620             if (run_program_and_log_output(tmp2, FALSE)) {
     622            if (run_program_and_log_output(tmp2, 2)) {
    621623                fatal_error
    622624                    ("output folder does not exist - please create it");
    … …  
    633635
    634636    if (flag_set['n']) {
    635         mr_asprintf(&tmp2, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
    636                 bkpinfo->nfs_remote_dir);
    637         if (run_program_and_log_output(tmp2, FALSE)) {
     637        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
     638        mr_asprintf(&tmp2, "echo hi > %s", tmp1);
     639        if (run_program_and_log_output(tmp2, 2)) {
    638640            retval++;
    639641            mr_free(tmp2);
    … …  
    644646        }
    645647        mr_free(tmp2);
     648        unlink(tmp1);
     649        mr_free(tmp1);
    646650    }
    647651
    … …  
    749753        &&
    750754        !run_program_and_log_output
    751         ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", TRUE)) {
     755        ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", 2)) {
    752756        bkpinfo->make_cd_use_lilo = TRUE;
    753757        log_to_screen
    … …  
    767771                (_("using LILO instead of SYSLINUX as the CD's boot loader."));
    768772        }
    769         if (run_program_and_log_output("which mkfs.vfat", FALSE)) {
     773        if (run_program_and_log_output("which mkfs.vfat", 2)) {
    770774            bkpinfo->make_cd_use_lilo = TRUE;
    771775#ifdef __IA32__

  • branches/stable/mondo/src/mondoarchive/mondoarchive.c

    r1769 r1770  
    4444extern bool g_remount_cdrom_at_end, g_remount_floppy_at_end;
    4545extern char *g_tmpfs_mountpt;
    46 extern char *g_erase_tmpdir_and_scratchdir;
    4746extern char *g_cdrw_drive_is_here;
    4847extern double g_kernel_version;
    … …  
    484483
    485484    mr_msg(9, "Next");
     485    make_hole_for_dir(MONDO_CACHE);
     486
    486487    welcome_to_mondoarchive();
    487488    distro_specific_kludges_at_start_of_mondoarchive();
    … …  
    620621        (_("BusyBox's sources are available from http://www.busybox.net"));
    621622
    622     sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
    623             bkpinfo->scratchdir);
    624623
    625624    /* If we're meant to backup then backup */
    … …  
    660659    }
    661660
    662     if (length_of_file(MINDI_CACHE"/changed.files") > 2) {
     661    if (length_of_file(MONDO_CACHE"/changed.files") > 2) {
    663662        if (g_text_mode) {
    664663            log_to_screen
    665                 (_("Type 'less "MINDI_CACHE"/changed.files' to see which files don't match the archives"));
     664                (_("Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives"));
    666665        } else {
    667666            mr_msg(1,
    668                     _("Type 'less "MINDI_CACHE"/changed.files' to see which files don't match the archives"));
     667                    _("Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives"));
    669668            mr_msg(2, "Calling popup_changelist_from_file()");
    670             popup_changelist_from_file(MINDI_CACHE"/changed.files");
     669            popup_changelist_from_file(MONDO_CACHE"/changed.files");
    671670            mr_msg(2, "Returned from popup_changelist_from_file()");
    672671        }
    673672    } else {
    674         unlink(MINDI_CACHE"/changed.files");
     673        unlink(MONDO_CACHE"/changed.files");
    675674    }
    676675    log_to_screen(say_at_end);
    … …  
    684683    run_program_and_log_output(tmp, TRUE);
    685684    mr_free(tmp);
    686     run_program_and_log_output(g_erase_tmpdir_and_scratchdir, TRUE);
     685    if (bkpinfo->backup_media_type == usb) {
     686        log_msg(1, "Unmounting USB device.");
     687        mr_asprintf(&tmp, "umount %s1", bkpinfo->media_device);
     688        run_program_and_log_output(tmp, TRUE);
     689        mr_free(tmp);
     690    }
    687691
    688692    run_program_and_log_output("mount", 2);
    689693
    690     system("rm -f /var/cache/mondo-archive/last-backup.aborted");
     694    system("rm -f "MONDO_CACHE"/last-backup.aborted");
    691695    if (!retval) {
    692696        printf(_("Mondoarchive ran OK.\n"));
    … …  
    697701    register_pid(0, "mondo");
    698702    set_signals(FALSE);
    699     chdir("/tmp");              // just in case there's something wrong with g_erase_tmpdir_and_scratchdir
    700     system(g_erase_tmpdir_and_scratchdir);
    701 
    702     /* assemble command string for deletion of Mondo's tmp directory */
    703     sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
    704    
     703
    705704    free_libmondo_global_strings();
    706705    mr_free(bkpinfo);
    … …  
    717716    mr_msg_close();
    718717
    719     /* remove Mondo's tmp directory */
    720     system(tmp);
    721     paranoid_free(tmp);
     718    chdir("/tmp");
    722719
    723720    if (!g_text_mode) {
    … …  
    725722            (_("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt."));
    726723        log_to_screen(_("See %s for details of backup run."), MONDO_LOGFILE);
    727         finish(retval);
    728724    } else {
    729725        printf(_("See %s for details of backup run.\n"), MONDO_LOGFILE);
    730726        mr_exit(retval, NULL);
    731727    }
     728    finish(retval);
    732729
    733730    return EXIT_SUCCESS;

  • branches/stable/mondo/src/mondorestore/mondo-prep.c

    r1555 r1770  
    22502250        strcpy(program, "mkfs.jfs");
    22512251    } else if (strcmp(format, "ext3") == 0) {
    2252         strcpy(program, "mkfs -t ext2 -F -j -q");
     2252        strcpy(program, "mkfs -t ext3 -F -q");
    22532253    } else if (strcmp(format, "minix") == 0) {
    22542254        strcpy(program, "mkfs.minix");

  • branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

    r1670 r1770  
    138138
    139139    if (retval) {
    140         if (!(fout = fopen(MINDI_CACHE"/changed.txt", "a"))) {
     140        if (!(fout = fopen(MONDO_CACHE"/changed.txt", "a"))) {
    141141            fatal_error("Cannot openout changed.txt");
    142142        }
    … …  
    306306    if (length_of_file(logfile) > 5) {
    307307        mr_asprintf(&command,
    308                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MINDI_CACHE"/changed.txt",
     308                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt",
    309309                logfile);
    310310        system(command);
    … …  
    464464    getcwd(new, MAX_STR_LEN - 1);
    465465    insist_on_this_cd_number(g_current_media_number);
    466     unlink(MINDI_CACHE"/changed.txt");
     466    unlink(MONDO_CACHE"/changed.txt");
    467467
    468468    resA = compare_all_tarballs();
    469469    resB = compare_all_biggiefiles();
    470470    chdir(cwd);
    471     noof_changed_files = count_lines_in_file(MINDI_CACHE"/changed.txt");
     471    noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
    472472    if (noof_changed_files) {
    473473        log_to_screen(_("%ld files do not match the backup            "),
    474474                noof_changed_files);
    475         mr_asprintf(&command, "cat "MINDI_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
     475        mr_asprintf(&command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
    476476        paranoid_system(command);
    477477        mr_free(command);
    … …  
    579579    }
    580580
    581     if (count_lines_in_file(MINDI_CACHE"/changed.txt") > 0) {
     581    if (count_lines_in_file(MONDO_CACHE"/changed.txt") > 0) {
    582582        mvaddstr_and_log_it(g_currentY++, 0,
    583583                            _
    584584                            ("Differences found while files were being compared."));
    585         streamline_changes_file(MINDI_CACHE"/changed.files", MINDI_CACHE"/changed.txt");
    586         if (count_lines_in_file(MINDI_CACHE"/changed.files") <= 0) {
     585        streamline_changes_file(MONDO_CACHE"/changed.files", MONDO_CACHE"/changed.txt");
     586        if (count_lines_in_file(MONDO_CACHE"/changed.files") <= 0) {
    587587            mvaddstr_and_log_it(g_currentY++, 0,
    588588                                _
    … …  
    591591                          ("The differences were logfiles and temporary files. Your archives are fine."));
    592592        } else {
    593             q = count_lines_in_file(MINDI_CACHE"/changed.files");
     593            q = count_lines_in_file(MONDO_CACHE"/changed.files");
    594594            mr_asprintf(&tmp, _("%ld significant difference%s found."), q,
    595595                    (q != 1) ? "s" : "");
    … …  
    608608            chdir(bkpinfo->restore_path);
    609609            getcwd(new, MAX_STR_LEN - 1);
    610             popup_changelist_from_file(MINDI_CACHE"/changed.files");
     610            popup_changelist_from_file(MONDO_CACHE"/changed.files");
    611611            mr_msg(2, "Returning from popup_changelist_from_file()");
    612612            chdir(cwd);
    … …  
    666666    res = verify_tape_backups();
    667667    chdir(dir);
    668     if (length_of_file(MINDI_CACHE"/changed.txt") > 2
    669         && length_of_file(MINDI_CACHE"/changed.files") > 2) {
     668    if (length_of_file(MONDO_CACHE"/changed.txt") > 2
     669        && length_of_file(MONDO_CACHE"/changed.files") > 2) {
    670670        mr_msg(0,
    671                 "Type 'less "MINDI_CACHE"/changed.files' to see which files don't match the archives");
     671                "Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives");
    672672        mr_msg(2, "Calling popup_changelist_from_file()");
    673         popup_changelist_from_file(MINDI_CACHE"/changed.files");
     673        popup_changelist_from_file(MONDO_CACHE"/changed.files");
    674674        mr_msg(2, "Returned from popup_changelist_from_file()");
    675675    }

  • branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

    r1663 r1770  
    182182    mr_asprintf(&format_str, "ufs");
    183183#else
    184     mr_asprintf(&format_str, "ext2");
     184    mr_asprintf(&format_str, "ext3");
    185185#endif
    186186    newtOpenWindow(20, 5, 48, 10, _("Add entry"));

  • branches/stable/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

    r1663 r1770  
    88extern int iso_fiddly_bits(bool nuke_me_please);
    99extern void kill_petris(void);
    10 extern int mount_cdrom();
     10extern int mount_media();
    1111extern int mount_all_devices(struct mountlist_itself *, bool);
    1212extern void protect_against_braindead_sysadmins(void);

  • branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

    r1769 r1770  
    342342    }
    343343    if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    344         mount_cdrom();
     344        mount_media();
    345345    }
    346346    i = what_number_cd_is_this();   /* has the side-effect of calling mount_cdrom() */
    … …  
    439439        mr_msg(2, "command='%s'", command);
    440440    }
    441     mr_free(additional_parameters);
    442 
    443441    res = run_program_and_log_output(command, TRUE);
    444     if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
    445         mr_msg(1, "Re-trying without the fancy extra parameters");
    446         mr_free(command);
    447 
    448         mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
    449                 mountdir, MONDO_LOGFILE);
    450         res = run_program_and_log_output(command, TRUE);
    451     }
    452442    if (res) {
    453443        mr_msg(1, "Unable to mount device %s (type %s) at %s", device,
    … …  
    533523
    534524            mr_asprintf(&format, mountlist->el[lino].format);
     525            /* BERLIOS: removed as it doen't make sens to not mount ext3 partitions as ext3
    535526            if (!strcmp(format, "ext3")) {
    536527                mr_free(format);
    537528                mr_asprintf(&format, "ext2");
    538529            }
     530            */
    539531            res = mount_device(mountlist->el[lino].device,
    540532                               mountlist->el[lino].mountpoint,
    … …  
    593585
    594586
    595 /**
    596  * Mount the CD-ROM device at /mnt/cdrom.
    597  * @param bkpinfo The backup information structure. Fields used:
    598  * - @c bkpinfo->backup_media_type
    599  * - @c bkpinfo->disaster_recovery
    600  * - @c bkpinfo->isodir
    601  * - @c bkpinfo->media_device
    602  * @return 0 for success, nonzero for failure.
    603  */
    604 int mount_cdrom()
     587/*
     588* Mount the CD-ROM or USB device at /mnt/cdrom.
     589* @param bkpinfo The backup information structure. Fields used:
     590* - @c bkpinfo->backup_media_type
     591* - @c bkpinfo->disaster_recovery
     592* - @c bkpinfo->isodir
     593* - @c bkpinfo->media_device
     594* @return 0 for success, nonzero for failure.
     595*/
     596int mount_media()
    605597{
    606598    char *mount_cmd = NULL;
    … …  
    614606    if (bkpinfo->backup_media_type == tape
    615607        || bkpinfo->backup_media_type == udev) {
    616         mr_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
     608        mr_msg(8, "Tape/udev. Therefore, no need to mount a media.");
    617609        return 0;
    618610    }
    619611
    620612    if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
    621         mr_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
     613        mr_msg(2, "mount_media() - media already mounted. Fair enough.");
    622614        return (0);
    623615    }
    … …  
    661653                MNT_CDROM);
    662654#endif
     655    } else if (bkpinfo->backup_media_type == usb) {
     656        mr_asprintf(&mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
    663657    } else if (strstr(bkpinfo->media_device, "/dev/"))
    664658#ifdef __FreeBSD__
    … …  
    679673            mr_allocstr(bkpinfo->media_device,
    680674                   last_line_of_file("/tmp/CDROM-LIVES-HERE"));
     675        } else {
     676            find_cdrom_device(bkpinfo->media_device, TRUE);
    681677        }
    682678
    683679#ifdef __FreeBSD__
    684         mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
     680    mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
    685681                MNT_CDROM);
    686682#else
    687         mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
     683    mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
    688684                bkpinfo->media_device, MNT_CDROM);
    689685#endif
    690 
    691     }
    692     mr_msg(2, "(mount_cdrom) --- command = %s", mount_cmd);
     686    }
     687
     688    mr_msg(2, "(mount_media) --- command = %s", mount_cmd);
    693689    for (i = 0; i < 2; i++) {
    694690        res = run_program_and_log_output(mount_cmd, FALSE);
    … …  
    706702        mr_msg(2, "Failed, despite %d attempts", i);
    707703    } else {
    708         mr_msg(2, "Mounted CD-ROM drive OK");
     704        mr_msg(2, "Mounted media OK");
    709705    }
    710706    return (res);
    711707}
     708
    712709/**************************************************************************
    713  *END_MOUNT_CDROM                                                         *
    714  **************************************************************************/
     710*END_MOUNT_CDROM                                                         *
     711**************************************************************************/
     712
    715713
    716714
    … …  
    784782        } else if (!strcmp(value, "dvd")) {
    785783            bkpinfo->backup_media_type = dvd;
     784        } else if (!strcmp(value, "usb")) {
     785            bkpinfo->backup_media_type = usb;
     786            bkpinfo->please_dont_eject = TRUE;
    786787        } else if (!strcmp(value, "iso")) {
    787788            // Patch by Conor Daly - 2004/07/12
    … …  
    824825                mr_allocstr(bkpinfo->prefix,envtmp1);
    825826            }
    826 
     827        } else if (bkpinfo->backup_media_type == usb) {
     828            if (read_cfg_var(cfg_file, "usb-dev", value)) {
     829                fatal_error("Cannot get USB device name from cfg file");
     830            }
     831            mr_asprintf(&tmp, "%s1", value);
     832            mr_allocstr(bkpinfo->media_device, tmp);
     833            mr_free(tmp);
     834               
     835            mr_asprintf(&tmp, "Backup medium is USB --- dev=%s", bkpinfo->media_device);
     836            log_msg(2, tmp);
     837            mr_free(tmp);
    827838        } else if (!strcmp(value, "tape")) {
    828839            bkpinfo->backup_media_type = tape;
    … …  
    908919        bkpinfo->differential = TRUE;
    909920    }
     921
    910922    mr_msg(2, "differential var = '%s'", value);
    911923    if (bkpinfo->differential) {
    … …  
    913925    } else {
    914926        mr_msg(2, "This is a regular (full) backup");
    915     }
    916927
    917928    read_cfg_var(g_mondo_cfg_file, "please-dont-eject", tmp);
    … …  
    10231034            mr_free(iso_path);
    10241035        }
     1036        /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
     1037        if (bkpinfo->backup_media_type == iso) {
     1038            sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
     1039        }
    10251040    }
    10261041
    … …  
    10431058    return (0);
    10441059}
     1060
    10451061/**************************************************************************
    10461062 *END_READ_CFG_FILE_INTO_BKPINFO                                          *
    … …  
    21112127        } else {
    21122128            mr_msg(2, "gcffa --- calling mount_cdrom now :)");
    2113             if (!mount_cdrom()) {
     2129            if (!mount_media()) {
    21142130                mr_msg(2,
    21152131                        "gcffa --- managed to mount CD; so, no need for Plan B");

  • branches/stable/mondo/src/mondorestore/mondo-rstr-tools.h

    r1663 r1770  
    88int iso_fiddly_bits(bool nuke_me_please);
    99void kill_petris(void);
    10 int mount_cdrom();
     10int mount_media();
    1111int mount_device(char *, char *, char *, bool);
    1212int mount_all_devices(struct mountlist_itself *, bool);

  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1769 r1770  
    437437    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
    438438    iamhere("Done loading config file; resizing ML");
    439     mr_asprintf(&tmp,bkpinfo->prefix);
    440     if (popup_and_get_string
    441         ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
    442         mr_free(bkpinfo->prefix);
    443         bkpinfo->prefix = tmp;
    444         mr_msg(1, "Prefix set to %s",bkpinfo->prefix);
     439    if (bkpinfo->backup_media_type != usb) {
     440        mr_asprintf(&tmp,bkpinfo->prefix);
     441        if (popup_and_get_string
     442            ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
     443            mr_free(bkpinfo->prefix);
     444            bkpinfo->prefix = tmp;
     445            mr_msg(1, "Prefix set to %s",bkpinfo->prefix);
     446        }
    445447    }
    446448   
    … …  
    924926    if (!g_restoring_live_from_cd) {
    925927        popup_and_OK
    926             (_("Please insert tape/CD, then hit 'OK' to continue."));
     928            (_("Please insert tape/CD/USB key, then hit 'OK' to continue."));
    927929        sleep(1);
    928930    }
    … …  
    25882590    mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives"));
    25892591    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    2590         mount_cdrom();
     2592        mount_media();
    25912593        mvaddstr_and_log_it(g_currentY++, 0,
    25922594                            _("Restoring OS and data from streaming media"));
    … …  
    26062608    } else {
    26072609        mvaddstr_and_log_it(g_currentY++, 0,
    2608                             _("Restoring OS and data from CD       "));
    2609         mount_cdrom();
     2610                            _("Restoring OS and data from CD/USB   "));
     2611        mount_media();
    26102612        resA = restore_all_tarballs_from_CD(filelist);
    26112613        resB = restore_all_biggiefiles_from_CD(filelist);
    … …  
    28762878    }
    28772879    mkdir(MNT_CDROM, 0x770);
     2880    make_hole_for_dir(MONDO_CACHE);
    28782881
    28792882/* Backup original mountlist.txt */
    … …  
    31553158    /* clean up at the end */
    31563159    if (retval) {
    3157         if (does_file_exist(MINDI_CACHE"/changed.files")) {
     3160        if (does_file_exist(MONDO_CACHE"/changed.files")) {
    31583161            log_to_screen
    3159                 (_("See "MINDI_CACHE"/changed.files for list of files that have changed."));
     3162                (_("See "MONDO_CACHE"/changed.files for list of files that have changed."));
    31603163        }
    31613164        mvaddstr_and_log_it(g_currentY++,

  • branches/stable/mondo/src/restore-scripts/mondo/hack-fstab

    r1548 r1770  
    2020    format=`echo "$incoming"     | cut -d' ' -f3`
    2121    size=`echo "$incoming"       | cut -d' ' -f4`
    22     label=`echo "$incoming"       | cut -d' ' -f5`
    23     uuid=`echo "$incoming"       | cut -d' ' -f6`
     22    label=`echo "$incoming"      | cut -d' ' -f5`
    2423    original_fstab_line=`grep " $mountpoint " $old_fstab | grep -v "#" | tr -s ' ' ' '`
    2524    if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
    … …  
    2827        fi
    2928        if [ "`echo "$original_fstab_line" | grep "UUID="`" != "" ] ; then
    30             device="UUID=$uuid"
     29            device="UUID=$label"
    3130        fi
    3231    fi

  • branches/stable/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

    r1341 r1770  
    1111    label=`echo "$1" | awk '{print $1}' | cut -d'=' -f2`
    1212    format=`echo "$1" | awk '{print $3}'`
     13    mountpt=`awk '{print $1,$5}' $mountlist | grep " $label$" | awk '{print $1}'`
    1314
    1415    if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then
    1516        opttun="-L"
    16         mountpt=`awk '{print $1,$5}' $mountlist | grep " $label$" | awk '{print $1}'`
    1717    elif [ "`echo "$1" | grep -E 'UUID='`" != "" ] ; then
    1818        opttun="-U"
    19         mountpt=`awk '{print $1,$6}' $mountlist | grep " $label$" | awk '{print $1}'`
    2019    else
    2120        # Nothing to do
    … …  
    3433        elif [ "$format" = "swap" ] ; then
    3534            if [ "$opttun" = "-U" ]; then
    36                 echo "Unable yet to identify swap with UUID"
     35                LogIt "Creating uuid $label on swap partition $label"
     36                echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
    3737            else
    3838                command="mkswap $opttun $label $mountpt"
Note: See TracChangeset for help on using the changeset viewer.