Changeset 2372 in MondoRescue

Timestamp:

Sep 8, 2009, 1:44:12 PM (15 years ago)

Author:

Bruno Cornec

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:

• mindi/rootfs/sbin/install-additional-tools (modified) (2 diffs)
• mondo/src/common/libmondo-mountlist.c (modified) (3 diffs)

branches/2.2.10/mindi/rootfs/sbin/install-additional-tools

@@ -18 +18 @@
 
 LogIt "Starting install-additional-tools"
-mountdir=$GROOVY
 
 if [ ! "$GROOVY" ] ; then
@@ -24 +23 @@
     exit 1
 fi
+
+mountdir=$GROOVY
 
 if [ $mountdir = "/" ]; then

branches/2.2.10/mondo/src/common/libmondo-mountlist.c

@@ -391 +391 @@
     if (physical_drive_size < 0) {
         mr_asprintf(tmp, " %s does not exist.", drive);
+        log_it(tmp);
         mr_strcat(flaws_str, "%s", tmp);
         res++;
-        log_msg(1, tmp);
         mr_free(tmp);
         return(flaws_str);
@@ -500 +500 @@
     }
 
-    if (res) {
+    if (res == 0) {
+        mr_free(flaws_str);
         return (NULL);
     } else {
@@ -549 +550 @@
             log_msg(8, "Evaluating drive #%d (%s) within mountlist", i, drivelist->el[i].device);
             tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device);
-            if (tmp == NULL) {
+            if (tmp != NULL) {
                 (*res)++;
             }