Changeset 3610 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Nov 5, 2016, 6:12:23 PM (7 years ago)

Author:

Bruno Cornec

Message:

• Change interfaces for the call_program_and_get_last_line_of_output and where_is_root_mounted(now return dynamically allocated string)
• removes useless function store_netfs_config

File:

• branches/3.2/mondo/src/mondorestore/mondo-prep.c (modified) (4 diffs)

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -154 +154 @@
 char *tmp;
 char *tmp1 = NULL;
+char *tmp2 = NULL;
 char *incoming;
 char *command;
@@ -186 +187 @@
 #endif
 
-if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "nolvm")) {
+tmp = call_program_and_get_last_line_of_output("cat "CMDLINE);
+if (strstr(tmp, "nolvm")) {
+    mr_free(tmp);
     return(0);
 }
+mr_free(tmp);
+
 if (!(fin = fopen("/tmp/i-want-my-lvm", "r"))) {
     log_OS_error("/tmp/i-want-my-lvm");
@@ -299 +304 @@
             if (lvmversion == 2) {
                 mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
-                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
-                free(tmp1);
             } else {
                 mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
-                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
-                free(tmp1);
             }
+            tmp2 =  call_program_and_get_last_line_of_output(tmp1);
+            strcpy(tmp, tmp2);
+            mr_free(tmp2);
+            mr_free(tmp1);
+
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);
             extents = atol(p);
@@ -1482 +1488 @@
     // mark relevant partition as bootable
     mr_asprintf(tmp1,"mr-make-me-bootable /tmp/mountlist.txt %s",drivename);
-    call_program_and_get_last_line_of_output(tmp1);
+    tmp = call_program_and_get_last_line_of_output(tmp1);
     mr_free(tmp1);
+    mr_free(tmp);
 
     log_msg(0,"------------------- end of fdisk.log...       ------------------");