Changeset 2850 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c
- Timestamp:
- Jul 24, 2011, 4:12:44 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-archive.c
r2704 r2850 1575 1575 char *message_to_screen = NULL; 1576 1576 char *sz_blank_disk = NULL; 1577 char *isofs_cmd = NULL; 1578 char *full_isofs_cmd = NULL; 1577 1579 char *mds = NULL; 1578 1580 bool cd_is_mountable; … … 1709 1711 mr_asprintf(result_sz, "Call to mkisofs to make ISO (%s #%d) ", mds, g_current_media_number); 1710 1712 mr_free(mds); 1713 if (find_home_of_exe("genisoimage")) { 1714 mr_asprintf(&isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD); 1715 } else { 1716 mr_asprintf(&isofs_cmd, "%s", MONDO_MKISOFS_CMD); 1717 } 1711 1718 if (bkpinfo->nonbootable_backup) { 1712 1719 log_msg(1, "Making nonbootable backup"); 1713 res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen); 1720 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS); 1721 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen); 1722 mr_free(full_isofs_cmd); 1714 1723 } else { 1715 1724 log_msg(1, "Making bootable backup"); … … 1720 1729 1721 1730 1722 log_msg(1, "make_cd_use_lilo is actually %d", 1723 bkpinfo->make_cd_use_lilo); 1731 log_msg(1, "make_cd_use_lilo is actually %d", bkpinfo->make_cd_use_lilo); 1724 1732 if (bkpinfo->make_cd_use_lilo) { 1725 1733 log_msg(1, "make_cd_use_lilo = TRUE"); 1726 1734 #ifdef __IA64__ 1727 1735 log_msg(1, "IA64 --> elilo"); 1728 res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen); 1736 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO); 1737 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen); 1738 mr_free(full_isofs_cmd); 1729 1739 #else 1730 1740 log_msg(1, "Non-ia64 --> lilo"); 1741 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); 1731 1742 // FIXME: fixed boot size probably wrong. lilo to be removed 1732 res = eval_call_to_make_ISO( MONDO_MKISOFS"-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .", destfile, g_current_media_number, message_to_screen);1743 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen); 1733 1744 #endif 1734 1745 } else { 1735 1746 log_msg(1, "make_cd_use_lilo = FALSE"); 1736 1747 log_msg(1, "Isolinux"); 1737 res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen); 1748 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX); 1749 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen); 1738 1750 } 1739 } 1751 mr_free(full_isofs_cmd); 1752 } 1753 mr_free(isofs_cmd); 1740 1754 paranoid_free(message_to_screen); 1741 1755 … … 3005 3019 * - @c manual_cd_tray 3006 3020 * - @c media_size 3007 * - @c netfs_mount3008 3021 * - @c netfs_remote_dir 3009 3022 * - @c scratchdir
Note:
See TracChangeset
for help on using the changeset viewer.