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/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");
Note: See TracChangeset for help on using the changeset viewer.