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