Changeset 3542 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c
- Timestamp:
- Mar 24, 2016, 5:48:03 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c
r3439 r3542 591 591 run_program_and_log_output("touch " MNT_RESTORING "/var/log/pacct", FALSE); 592 592 run_program_and_log_output("touch " MNT_RESTORING "/var/account/pacct", FALSE); 593 if (run_program_and_log_output("ls " MNT_RESTORING " /tmp", FALSE)) {593 if (run_program_and_log_output("ls -al " MNT_RESTORING " /tmp", FALSE)) { 594 594 run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp", FALSE); 595 595 } … … 1399 1399 /* Only try to adapt grub here first if the mountlist wasn't changed before */ 1400 1400 if (! mntlistchg) { 1401 mr_asprintf(command, " stabgrub-me %s", boot_device);1401 mr_asprintf(command, "mr-stabgrub-me %s", boot_device); 1402 1402 res = run_program_and_log_output(command, 1); 1403 1403 mr_free(command); … … 1444 1444 newtResume(); 1445 1445 } 1446 mr_asprintf(command, " stabgrub-me %s", boot_device);1446 mr_asprintf(command, "mr-stabgrub-me %s", boot_device); 1447 1447 res = run_program_and_log_output(command, 1); 1448 1448 mr_free(command); … … 1463 1463 } else { 1464 1464 /* nuke mode */ 1465 if (!run_program_and_log_output("which grub-MR", FALSE)) {1466 log_msg(1, "Yay! grub-MRfound...");1467 mr_asprintf(command, " grub-MR%s /"MOUNTLIST_FNAME_STUB, boot_device);1465 if (!run_program_and_log_output("which mr-grub", FALSE)) { 1466 log_msg(1, "Yay! mr-grub found..."); 1467 mr_asprintf(command, "mr-grub %s /"MOUNTLIST_FNAME_STUB, boot_device); 1468 1468 log_msg(1, "command = %s", command); 1469 1469 } else { 1470 1470 // Or grub2-install 1471 1471 mr_asprintf(command, "chroot " MNT_RESTORING " grub-install %s", boot_device); 1472 log_msg(1, "WARNING - grub-MRnot found; using grub-install");1472 log_msg(1, "WARNING - mr-grub not found; using grub-install"); 1473 1473 } 1474 1474 mvaddstr_and_log_it(g_currentY, 0, "Running GRUB... "); … … 1489 1489 ("GRUB ran w/error(s). See %s for more info.", MONDO_LOGFILE); 1490 1490 log_msg(1, "Type:-"); 1491 log_msg(1, " m ount-me");1491 log_msg(1, " mr-mount-me"); 1492 1492 log_msg(1, " chroot " MNT_RESTORING); 1493 1493 log_msg(1, " mount /boot"); 1494 1494 log_msg(1, " grub-install '(hd0)'"); 1495 1495 log_msg(1, " exit"); 1496 log_msg(1, " unmount-me");1496 log_msg(1, " mr-unmount-me"); 1497 1497 log_msg(1, 1498 1498 "If you're really stuck, please e-mail the mailing list."); … … 1533 1533 0, 1534 1534 "Modifying fstab and elilo.conf... "); 1535 mr_asprintf(command, " stabelilo-me");1535 mr_asprintf(command, "mr-stabelilo-me"); 1536 1536 res = run_program_and_log_output(command, 3); 1537 1537 mr_free(command); … … 1609 1609 0, 1610 1610 "Modifying fstab and lilo.conf, and running LILO... "); 1611 mr_asprintf(command, " stablilo-me");1611 mr_asprintf(command, "mr-stablilo-me"); 1612 1612 res = run_program_and_log_output(command, 3); 1613 1613 mr_free(command); … … 1735 1735 } 1736 1736 popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device, MAX_STR_LEN / 4); 1737 mr_asprintf(command, " stabraw-me %s", boot_device);1737 mr_asprintf(command, "mr-stabraw-me %s", boot_device); 1738 1738 res = run_program_and_log_output(command, 3); 1739 1739 mr_free(command); … … 1747 1747 } else { 1748 1748 /* nuke mode */ 1749 mr_asprintf(command, " raw-MR%s /"MOUNTLIST_FNAME_STUB, boot_device);1749 mr_asprintf(command, "mr-raw %s /"MOUNTLIST_FNAME_STUB, boot_device); 1750 1750 log_msg(2, "run_raw_mbr() --- command='%s'", command); 1751 1751
Note:
See TracChangeset
for help on using the changeset viewer.