Changeset 3542 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondorestore.c

Timestamp:

Mar 24, 2016, 5:48:03 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Rename all mondorestore scripts with the mr- prefix and adapt callers
• Place these scripts in /usr/bin on the restore media
• Fix a mindi bug where these scripts were not copied anymore with previous modifications around removal of cd

File:

• branches/3.2/mondo/src/mondorestore/mondorestore.c (modified) (3 diffs)

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

@@ -2045 +2045 @@
             mr_asprintf(fstab_fname, "/tmp/fstab");
         }
-        mr_asprintf(tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_asprintf(tmp1, "mr-label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
         mr_free(fstab_fname);
 
@@ -2051 +2051 @@
         mr_free(tmp1);
         if (res) {
-            log_to_screen("label-partitions-as-necessary returned an error");
+            log_to_screen("mr-label-partitions-as-necessary returned an error");
             mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
         } else {
@@ -2191 +2191 @@
     mvaddstr_and_log_it(g_currentY, 0, "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
 
-    mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", "/tmp/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(tmp1, "mr-label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", "/tmp/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp1, TRUE);
     mr_free(tmp1);
     if (res) {
-        log_to_screen("label-partitions-as-necessary returned an error");
+        log_to_screen("mr-label-partitions-as-necessary returned an error");
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     } else {