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

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

Location:

branches/3.2/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (9 diffs)
• mondorestore.c (modified) (3 diffs)

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

@@ -1473 +1473 @@
 
     // mark relevant partition as bootable
-    mr_asprintf(tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
+    mr_asprintf(tmp1,"mr-make-me-bootable /tmp/mountlist.txt %s",drivename);
     call_program_and_get_last_line_of_output(tmp1);
     mr_free(tmp1);

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -591 +591 @@
 run_program_and_log_output("touch " MNT_RESTORING "/var/log/pacct", FALSE);
 run_program_and_log_output("touch " MNT_RESTORING "/var/account/pacct", FALSE);
-if (run_program_and_log_output("ls " MNT_RESTORING " /tmp", FALSE)) {
+if (run_program_and_log_output("ls -al " MNT_RESTORING " /tmp", FALSE)) {
     run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp", FALSE);
 }
@@ -1399 +1399 @@
             /*  Only try to adapt grub here first if the mountlist wasn't changed before */
             if (! mntlistchg) {
-                mr_asprintf(command, "stabgrub-me %s", boot_device);
+                mr_asprintf(command, "mr-stabgrub-me %s", boot_device);
                 res = run_program_and_log_output(command, 1);
                 mr_free(command);
@@ -1444 +1444 @@
                     newtResume();
                 }
-                mr_asprintf(command, "stabgrub-me %s", boot_device);
+                mr_asprintf(command, "mr-stabgrub-me %s", boot_device);
                 res = run_program_and_log_output(command, 1);
                 mr_free(command);
@@ -1463 +1463 @@
     } else {
         /* nuke mode */
-        if (!run_program_and_log_output("which grub-MR", FALSE)) {
-            log_msg(1, "Yay! grub-MR found...");
-            mr_asprintf(command, "grub-MR %s /"MOUNTLIST_FNAME_STUB, boot_device);
+        if (!run_program_and_log_output("which mr-grub", FALSE)) {
+            log_msg(1, "Yay! mr-grub found...");
+            mr_asprintf(command, "mr-grub %s /"MOUNTLIST_FNAME_STUB, boot_device);
             log_msg(1, "command = %s", command);
         } else {
             // Or grub2-install
             mr_asprintf(command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
-            log_msg(1, "WARNING - grub-MR not found; using grub-install");
+            log_msg(1, "WARNING - mr-grub not found; using grub-install");
         }
         mvaddstr_and_log_it(g_currentY, 0, "Running GRUB...                                                 ");
@@ -1489 +1489 @@
             ("GRUB ran w/error(s). See %s for more info.", MONDO_LOGFILE);
         log_msg(1, "Type:-");
-        log_msg(1, "    mount-me");
+        log_msg(1, "    mr-mount-me");
         log_msg(1, "    chroot " MNT_RESTORING);
         log_msg(1, "    mount /boot");
         log_msg(1, "    grub-install '(hd0)'");
         log_msg(1, "    exit");
-        log_msg(1, "    unmount-me");
+        log_msg(1, "    mr-unmount-me");
         log_msg(1,
                 "If you're really stuck, please e-mail the mailing list.");
@@ -1533 +1533 @@
                             0,
                             "Modifying fstab and elilo.conf...                             ");
-        mr_asprintf(command, "stabelilo-me");
+        mr_asprintf(command, "mr-stabelilo-me");
         res = run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1609 +1609 @@
                             0,
                             "Modifying fstab and lilo.conf, and running LILO...                             ");
-        mr_asprintf(command, "stablilo-me");
+        mr_asprintf(command, "mr-stablilo-me");
         res = run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1735 +1735 @@
             }
             popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device, MAX_STR_LEN / 4);
-            mr_asprintf(command, "stabraw-me %s", boot_device);
+            mr_asprintf(command, "mr-stabraw-me %s", boot_device);
             res = run_program_and_log_output(command, 3);
             mr_free(command);
@@ -1747 +1747 @@
     } else {
         /* nuke mode */
-        mr_asprintf(command, "raw-MR %s /"MOUNTLIST_FNAME_STUB, boot_device);
+        mr_asprintf(command, "mr-raw %s /"MOUNTLIST_FNAME_STUB, boot_device);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
 

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 {