Changeset 3161 in MondoRescue for branches/3.1/mondo/src/common/libmondo-archive.c
- Timestamp:
- Jun 25, 2013, 10:53:14 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.1/mondo/src/common/libmondo-archive.c
r3148 r3161 686 686 fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?"); 687 687 } 688 mr_asprintf( &bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));688 mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version", TRUE)); 689 689 } else if (bkpinfo->boot_loader == 'E') { 690 690 mr_asprintf(bootldr_str, "ELILO"); … … 722 722 log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device); 723 723 if (bootldr_ver != NULL) { 724 mr_asprintf( &tmp, "Boot loader version string: %s", bootldr_ver);724 mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver); 725 725 log_to_screen(tmp); 726 726 mr_free(tmp); 727 727 } 728 728 if (bootldr_ver != NULL) { 729 mr_asprintf( &tmp, "Boot loader version string: %s", bootldr_ver);729 mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver); 730 730 log_to_screen(tmp); 731 731 mr_free(tmp); … … 1590 1590 /*@ buffers ****************************************** */ 1591 1591 char *tmp = NULL; 1592 char *tmp2 = NULL; 1592 1593 char *old_pwd; 1593 1594 char *result_sz = NULL; … … 1614 1615 log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile); 1615 1616 tmp2 = getcwd(old_pwd, MAX_STR_LEN - 1); 1617 if (! tmp2) { 1618 //FIXME 1619 } 1616 1620 mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir); 1617 1621 run_program_and_log_output(tmp, FALSE); … … 1733 1737 mr_free(mds); 1734 1738 if (find_home_of_exe("genisoimage")) { 1735 mr_asprintf( &isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);1739 mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD); 1736 1740 } else { 1737 mr_asprintf( &isofs_cmd, "%s", MONDO_MKISOFS_CMD);1741 mr_asprintf(isofs_cmd, "%s", MONDO_MKISOFS_CMD); 1738 1742 } 1739 1743 if (bkpinfo->nonbootable_backup) { 1740 1744 log_msg(1, "Making nonbootable backup"); 1741 1745 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS); 1742 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE,message_to_screen);1746 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen); 1743 1747 mr_free(full_isofs_cmd); 1744 1748 } else { … … 1756 1760 log_msg(1, "IA64 --> elilo"); 1757 1761 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO); 1758 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE,message_to_screen);1762 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen); 1759 1763 mr_free(full_isofs_cmd); 1760 1764 #else … … 1762 1766 mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS); 1763 1767 // FIXME: fixed boot size probably wrong. lilo to be removed 1764 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE,message_to_screen);1768 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen); 1765 1769 #endif 1766 1770 } else { … … 1768 1772 log_msg(1, "Isolinux"); 1769 1773 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX); 1770 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE,message_to_screen);1774 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen); 1771 1775 } 1772 1776 mr_free(full_isofs_cmd); … … 1884 1888 /*@ pointers ******************************************* */ 1885 1889 FILE *fin = NULL; 1886 char *q;1887 char *q;1888 1890 1889 1891 /*@ buffers ******************************************** */
Note:
See TracChangeset
for help on using the changeset viewer.