Changeset 2372


Ignore:
Timestamp:
Sep 8, 2009, 1:44:12 PM (10 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.

(Backport from 2.2.9)

Location:
branches/2.2.10
Files:
2 edited

Legend:

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

    r2364 r2372  
    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.10/mondo/src/common/libmondo-mountlist.c

    r2357 r2372  
    391391    if (physical_drive_size < 0) {
    392392        mr_asprintf(tmp, " %s does not exist.", drive);
     393        log_it(tmp);
    393394        mr_strcat(flaws_str, "%s", tmp);
    394395        res++;
    395         log_msg(1, tmp);
    396396        mr_free(tmp);
    397397        return(flaws_str);
     
    500500    }
    501501
    502     if (res) {
     502    if (res == 0) {
     503        mr_free(flaws_str);
    503504        return (NULL);
    504505    } else {
     
    549550            log_msg(8, "Evaluating drive #%d (%s) within mountlist", i, drivelist->el[i].device);
    550551            tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device);
    551             if (tmp == NULL) {
     552            if (tmp != NULL) {
    552553                (*res)++;
    553554            }
Note: See TracChangeset for help on using the changeset viewer.