Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (13 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)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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);
Note: See TracChangeset for help on using the changeset viewer.