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

    r2816 r2850  
    20192019                    mr_strcat(bkpinfo->exclude_paths,"|%s",mounted_on_dsf);
    20202020                } else {
    2021                     mr_asprintf(bkpinfo->exclude_paths,"%s",mounted_on_dsf);
     2021                    mr_asprintf(&(bkpinfo->exclude_paths),"%s",mounted_on_dsf);
    20222022                }
    20232023                if (bkpinfo->exclude_devs) {
    20242024                    mr_strcat(bkpinfo->exclude_devs,"|%s",token);
    20252025                } else {
    2026                     mr_asprintf(bkpinfo->exclude_devs,"%s",token);
     2026                    mr_asprintf(&(bkpinfo->exclude_devs),"%s",token);
    20272027                }
    20282028            }
     
    20392039                    mr_strcat(bkpinfo->exclude_paths, "|%s",not_mounted_on_dsf);
    20402040                } else {
    2041                     mr_asprintf(bkpinfo->exclude_paths,"%s",not_mounted_on_dsf);
     2041                    mr_asprintf(&(bkpinfo->exclude_paths),"%s",not_mounted_on_dsf);
    20422042                }
    20432043            }
     
    26252625    char *tmp = NULL;
    26262626    char *p = NULL;
     2627    char *q = NULL;
    26272628    char *mds = NULL;
    26282629    char *sz_size = NULL;
     
    29152916            if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
    29162917                bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
    2917             mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->netfs_mount);
     2918            q = strchr(bkpinfo->netfs_mount, '@');
     2919            if (q != NULL) {
     2920                /* User found. Store the 2 values */
     2921                q++;
     2922                /* new netfs mount */
     2923                mr_asprintf(tmp,"%s",q);
     2924            } else {
     2925                mr_asprintf(tmp,"%s",bkpinfo->netfs_mount);
     2926            }
     2927            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", tmp);
     2928            mr_free(tmp);
     2929
    29182930            mr_free(bkpinfo->isodir);
    29192931            bkpinfo->isodir = call_program_and_get_last_line_of_output(command,TRUE);
     
    29642976        bkpinfo->netfs_mount = p;
    29652977
     2978        if (bkpinfo->netfs_user) {
     2979            strcpy(tmp1, bkpinfo->netfs_user);
     2980        } else {
     2981            strcpy(tmp1, "");
     2982        }
     2983        if (!popup_and_get_string
     2984            ("Network user", "Which user should I use if any ?",
     2985             tmp1, MAX_STR_LEN)) {
     2986            log_to_screen("User has chosen not to backup the PC");
     2987            finish(1);
     2988        }
     2989        mr_free(bkpinfo->netfs_user);
     2990        if (strcmp(tmp1, "") != 0) {
     2991            mr_asprintf(&(bkpinfo->netfs_user), "%s", tmp1);
     2992        }
     2993   
    29662994        /* Initiate bkpinfo isodir path from running environment if mount already done */
    29672995        mr_free(bkpinfo->isodir);
     
    29773005            if (bkpinfo->restore_data) {
    29783006                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
    2979                     mr_asprintf(tmp, "sshfs -o ro %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
     3007                    mr_asprintf(tmp, "sshfs -o ro");
    29803008                } else {
    2981                     mr_asprintf(tmp, "mount -t %s -o nolock,ro %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
     3009                    mr_asprintf(tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto);
    29823010                }
    29833011            } else {
    29843012                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
    2985                     mr_asprintf(tmp, "sshfs %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
     3013                    mr_asprintf(tmp, "sshfs");
    29863014                } else {
    2987                     mr_asprintf(tmp, "mount -t %s -o nolock %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
     3015                    mr_asprintf(tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto);
    29883016                }
    29893017            }
     3018            if (bkpinfo->netfs_user) {
     3019                mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
     3020            }
     3021            mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
    29903022            run_program_and_log_output(tmp, 3);
    29913023            mr_free(tmp);
     
    32123244            bkpinfo->zip_suffix = NULL;
    32133245        }
     3246
    32143247        bkpinfo->verify_data =
    32153248            ask_me_yes_or_no
Note: See TracChangeset for help on using the changeset viewer.