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-cli.c

    r2816 r2850  
    495495        if (strlen(bkpinfo->isodir) < 3) {
    496496            log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
    497             if (strstr(bkpinfo->netfs_proto, "sshfs")) {
    498                 mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
    499             } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
    500                 mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
     497            if (bkpinfo->netfs_user) {
     498                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
     499                    mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
     500                } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
     501                    mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
     502                } else {
     503                    log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
     504                    fatal_error("Bad Protocol\n");
     505                }
    501506            } else {
    502                 log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
    503                 fatal_error("Bad Protocol\n");
     507                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
     508                    mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
     509                } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
     510                    mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
     511                } else {
     512                    log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
     513                    fatal_error("Bad Protocol\n");
     514                }
    504515            }
    505516            i = system(tmp1);
    506517            mr_free(tmp1);
     518
    507519            if (i) {
    508520                log_to_screen("Unable to mount Network share %s. Please mount manually.\n", bkpinfo->netfs_mount);
    509521                retval++;
    510522            } else {
    511                 mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
     523                if (bkpinfo->netfs_user) {
     524                    mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
     525                } else {
     526                    mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
     527                }
    512528                mr_free(bkpinfo->isodir);
    513529                bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp1,TRUE);
Note: See TracChangeset for help on using the changeset viewer.