Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (12 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-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
Note: See TracChangeset for help on using the changeset viewer.