Changeset 3643 in MondoRescue

Timestamp:

Dec 26, 2016, 12:39:30 AM (7 years ago)

Author:

Bruno Cornec

Message:

• Add a log of device.map for grub2
• Remove extra memory allocation at end of loop for run_program_and_log_output

Location:

branches/3.3

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (1 diff)
• mondo/src/lib/mr_mem.c (modified) (1 diff)

branches/3.3/mindi/mindi

@@ -3267 +3267 @@
     LogFile "-------------"
 fi
+if [ -r /boot/grub2/device.map ]; then
+    LogFile "-------------"
+    LogFile "INFO: /boot/grub2/device.map content"
+    LogFile "-------------"
+    cat /boot/grub2/device.map >> $LOGFILE
+    LogFile "-------------"
+fi
 if [ -r /etc/lilo.conf ]; then
     LogFile "-------------"

branches/3.3/mondo/src/common/libmondo-fork.c

@@ -323 +323 @@
             mr_free(incoming);
         }
+        mr_free(incoming);
         paranoid_fclose(fin);
     }

branches/3.3/mondo/src/lib/mr_mem.c

@@ -76 +76 @@
     if (*lineptr != NULL) {
         /* free a variable which should be already free */
-        mr_msg_int(1,line,file,"mr_getline_int","mr_getline_ found a non freed variable here");
+        mr_msg_int(1,line,file,"mr_getline_int","mr_getline found a non freed variable here");
         mr_free_int((void **)lineptr,line,file);
     }