Changeset 2371


Ignore:
Timestamp:
Sep 8, 2009, 1:40:25 PM (9 years ago)
Author:
bruno
Message:
  • Fix a problem a error detection in evaluate_mountlist which casued nuke mode to abort. Error string should also be better now.
Location:
branches/2.2.9
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mindi/rootfs/sbin/install-additional-tools

    r2363 r2371  
    1818
    1919LogIt "Starting install-additional-tools"
    20 mountdir=$GROOVY
    2120
    2221if [ ! "$GROOVY" ] ; then
     
    2423    exit 1
    2524fi
     25
     26mountdir=$GROOVY
    2627
    2728if [ $mountdir = "/" ]; then
  • branches/2.2.9/mondo/src/common/libmondo-mountlist.c

    r2350 r2371  
    375375    if (physical_drive_size < 0) {
    376376        sprintf(tmp, " %s does not exist.", drive);
     377        log_it(tmp);
    377378        mr_strcat(flaws_str, "%s", tmp);
    378379        res++;
    379         log_msg(1, tmp);
    380380        goto endoffunc;
    381381    } else {
     
    481481    paranoid_free(device);
    482482
    483     if (res) {
     483    if (res == 0) {
     484        mr_free(flaws_str);
    484485        return (NULL);
    485486    } else {
     
    532533            log_msg(8, "Evaluating drive #%d (%s) within mountlist", i, drivelist->el[i].device);
    533534            tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device);
    534             if (tmp == NULL) {
     535            if (tmp != NULL) {
    535536                (*res)++;
    536537            }
Note: See TracChangeset for help on using the changeset viewer.