Ignore:
Timestamp:
Jul 24, 2011, 4:12:44 AM (9 years ago)
Author:
Bruno Cornec
Message:

svn merge -r 2773:2849 2.2.9 in 2.2.10

  • Adds 3 binaries called potentially by udev o support USB key mount at restore time (Victor Gattegno)
  • Really support both mkisofs and genisoimage everywhere
  • Try to handle netfs_user better in all cases (NFS and SSHFS)
    • Improve logging in init script
    • Format improvement
    • Removes a warning when trying to launch udevadm and it doesn't exist (RHEL 5 e.g.)
    • Fix syntax description in mondoarchive man page for -E & -I with |
  • Adds download entries for new distro supported (Mageia, Fedora 15, Ubuntu 11.04)

-Fix mindi-get-perl-modules when perl dirs in @INC are symlinks (case on Ubuntu 11.04)

  • Fix option --findkernel in case of Xen kernel so that mondoarchive get a correct answer instead of an empty one.
  • Fix multi-media restore by umounting it before looping to ask for the next (as if already mounted, will not pass to the next alone)
  • Fix 485 by replacing a wrong call to mr_asprintf which was provoking core dumped.
  • Fix -E and -I example in man page which were lacking the '|' as separator
  • Fix #484 by adding support for the arcmsr driver (to support the Areca ARC-1220 RAID Controller)
    • Avoids error msgs if no mondo-restore.cfg file exists (when mindi used stdalone)
    • Adds the swapon feature to mindi-busybox
    • Attempt to fix Xen kernel support by avoiding to remove xen kernel fro; the possible_kernels list too early, whereas it's used afterwards to get them.
    • Fix #481 by supporting the new kbd file in latest Ubuntu 10.10+ (victor.gattegno_at_hp.com)
  • Update from Lester Wade on P2V doc including RHEL6 validation and some minor additions
  • removes telinit call in busybox o try to fix problems whn reboot at end of restore.
  • if -E option for mondoarchive was not specified, variable excp points to NULL, so string exclude_pathes contained '(null)' instead of being avoided (derived from a patch from taguchi_at_ff.iij4u.or.jp)
  • fix -maxdepth option for find command. it sould be '-maxdepth .. -name ..', not '-name .. -maxdepth ..' (patch from taguchi_at_ff.iij4u.or.jp)
  • Adds an extraversion for revision support
  • Adds support for ifconfig and ping for PXE+NFS boot for this version of mindi-busybox
  • Example of MINDI_ADDITIONAL_BOOT_PARAMS in mindi.conf added
  • fix a compilation error
  • Remove an absolute ref in the docs web page
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mondo/src/common/libmondo-archive.c

    r2704 r2850  
    15751575    char *message_to_screen = NULL;
    15761576    char *sz_blank_disk = NULL;
     1577    char *isofs_cmd = NULL;
     1578    char *full_isofs_cmd = NULL;
    15771579    char *mds = NULL;
    15781580    bool cd_is_mountable;
     
    17091711        mr_asprintf(result_sz, "Call to mkisofs to make ISO (%s #%d) ", mds,  g_current_media_number);
    17101712        mr_free(mds);
     1713        if (find_home_of_exe("genisoimage")) {
     1714            mr_asprintf(&isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
     1715        } else {
     1716            mr_asprintf(&isofs_cmd, "%s", MONDO_MKISOFS_CMD);
     1717        }
    17111718        if (bkpinfo->nonbootable_backup) {
    17121719            log_msg(1, "Making nonbootable backup");
    1713             res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
     1720            mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
     1721            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1722            mr_free(full_isofs_cmd);
    17141723        } else {
    17151724            log_msg(1, "Making bootable backup");
     
    17201729
    17211730
    1722             log_msg(1, "make_cd_use_lilo is actually %d",
    1723                     bkpinfo->make_cd_use_lilo);
     1731            log_msg(1, "make_cd_use_lilo is actually %d", bkpinfo->make_cd_use_lilo);
    17241732            if (bkpinfo->make_cd_use_lilo) {
    17251733                log_msg(1, "make_cd_use_lilo = TRUE");
    17261734#ifdef __IA64__
    17271735                log_msg(1, "IA64 --> elilo");
    1728                 res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
     1736                mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
     1737                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1738                mr_free(full_isofs_cmd);
    17291739#else
    17301740                log_msg(1, "Non-ia64 --> lilo");
     1741                mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
    17311742                    // FIXME: fixed boot size probably wrong. lilo to be removed
    1732                 res = eval_call_to_make_ISO(MONDO_MKISOFS"-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
     1743                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
    17331744#endif
    17341745            } else {
    17351746                log_msg(1, "make_cd_use_lilo = FALSE");
    17361747                log_msg(1, "Isolinux");
    1737                 res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
     1748                mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX);
     1749                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
    17381750            }
    1739         }
     1751            mr_free(full_isofs_cmd);
     1752        }
     1753        mr_free(isofs_cmd);
    17401754        paranoid_free(message_to_screen);
    17411755
     
    30053019 * - @c manual_cd_tray
    30063020 * - @c media_size
    3007  * - @c netfs_mount
    30083021 * - @c netfs_remote_dir
    30093022 * - @c scratchdir
Note: See TracChangeset for help on using the changeset viewer.