Changeset 3539 in MondoRescue
- Timestamp:
- Mar 22, 2016, 1:50:08 AM (9 years ago)
- Location:
- branches/3.2/mondo/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-archive.c
r3527 r3539 1710 1710 if (bkpinfo->nonbootable_backup) { 1711 1711 log_msg(1, "Making nonbootable backup"); 1712 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_.",isofs_cmd,MONDO_MKISOFS);1712 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS); 1713 1713 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen); 1714 1714 mr_free(full_isofs_cmd); … … 1726 1726 #ifdef __IA64__ 1727 1727 log_msg(1, "IA64 --> elilo"); 1728 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_.",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);1728 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO); 1729 1729 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen); 1730 1730 mr_free(full_isofs_cmd); 1731 1731 #else 1732 1732 log_msg(1, "Non-ia64 --> lilo"); 1733 mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c images/boot.cat -o '_ISO_' -J -V _CD#_.",isofs_cmd,MONDO_MKISOFS);1733 mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c images/boot.cat -o '_ISO_' .",isofs_cmd,MONDO_MKISOFS); 1734 1734 // FIXME: fixed boot size probably wrong. lilo to be removed 1735 1735 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen); … … 1742 1742 if (strstr(isofs_cmd,"xorriso")) { 1743 1743 /* xorriso needs another '-' before efi-boot */ 1744 mr_asprintf(uefistr, " -%s", MONDO_MKISOFS_UEFI);1744 mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI); 1745 1745 } else { 1746 mr_asprintf(uefistr, "%s ", MONDO_MKISOFS_UEFI);1746 mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI); 1747 1747 } 1748 1748 } else { 1749 1749 mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS); 1750 1750 } 1751 mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' -V _CD#_.",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);1751 mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr); 1752 1752 mr_free(uefistr); 1753 1753 -
branches/3.2/mondo/src/common/libmondo-devices.c
r3511 r3539 3123 3123 3124 3124 if (bkpinfo->boot_type == UEFI) { 3125 /* hardcoded for now. We can for sure do a better job here ! */3125 /* hardcoded for now. We can for sure do a better job here ! */ 3126 3126 /* RHEL, SLES, Mageia, Debian, Ubuntu use grub as boot loader as it seems for UEFI */ 3127 3127 return ('G'); -
branches/3.2/mondo/src/common/libmondo-tools.c
r3514 r3539 499 499 #ifdef __IA64__ 500 500 { 501 mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);501 mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO); 502 502 } 503 503 #else 504 504 { 505 mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);505 mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO); 506 506 } 507 507 #endif … … 510 510 if (strstr(isofs_cmd,"xorriso")) { 511 511 /* xorriso needs another '-' before efi-boot */ 512 mr_asprintf(uefistr, " -%s", MONDO_MKISOFS_UEFI);512 mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI); 513 513 } else { 514 mr_asprintf(uefistr, "%s ", MONDO_MKISOFS_UEFI);514 mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI); 515 515 } 516 516 } else { … … 518 518 } 519 519 520 mr_asprintf(mondo_mkisofs_sz, "%s%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);520 mr_asprintf(mondo_mkisofs_sz, "%s%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr); 521 521 } 522 522 mr_free(isofs_cmd); -
branches/3.2/mondo/src/include/my-stuff.h
r3514 r3539 179 179 #define MONDO_GENISOIMAGE_CMD "genisoimage" 180 180 #define MONDO_XORRISO_CMD "xorriso -as mkisofs" 181 #define MONDO_MKISOFS " - r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version"182 #define MONDO_MKISOFS_CMS " -b syslinux/isolinux.bin -c syslinux/boot.cat - boot-load-size 4"183 #define MONDO_UEFI_ SUFFIX " -b EFI/isolinux.bin -c EFI/boot.cat -boot-load-size 4-eltorito-alt-boot "184 #define MONDO_MKISOFS_UEFI " -efi-boot images/mindi-bootroot.img -no-emul-boot "MONDO_UEFI_SUFFIX181 #define MONDO_MKISOFS " -J -r -v -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue -V _CD#_ " 182 #define MONDO_MKISOFS_CMS " -b syslinux/isolinux.bin -c syslinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " 183 #define MONDO_UEFI_PREFIX " -b EFI/isolinux.bin -c EFI/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot " 184 #define MONDO_MKISOFS_UEFI " -efi-boot images/mindi-bootroot.img -no-emul-boot " 185 185 186 186 /** 187 187 * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image. 188 188 */ 189 #define MONDO_MKISOFS_REGULAR_SYSLINUX MONDO_MKISOFS "-J -boot-info-table -no-emul-boot "189 #define MONDO_MKISOFS_REGULAR_SYSLINUX MONDO_MKISOFS 190 190 191 191 /** … … 197 197 * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image. 198 198 */ 199 #define MONDO_MKISOFS_REGULAR_ELILO MONDO_MKISOFS"- J -no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat "199 #define MONDO_MKISOFS_REGULAR_ELILO MONDO_MKISOFS"-no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat " 200 200 201 201 /** … … 207 207 * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image. 208 208 */ 209 #define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_SYSLINUX " -V _CD#_ -v"209 #define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_SYSLINUX 210 210 211 211 /** 212 212 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image. 213 213 */ 214 #define MONDO_GROWISOFS_REGULAR_ELILO "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_ELILO " -V _CD#_ -v"214 #define MONDO_GROWISOFS_REGULAR_ELILO "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_ELILO 215 215 216 216 /** 217 217 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image. 218 218 */ 219 #define MONDO_GROWISOFS_REGULAR_LILO "growisofs "MONDO_MKISOFS_REGULAR_SYSLINUX " -V _CD#_ -v"219 #define MONDO_GROWISOFS_REGULAR_LILO "growisofs "MONDO_MKISOFS_REGULAR_SYSLINUX 220 220 221 221 /** 222 222 * @c growisofs command to generate a nonbootable DVD, except for the directory to image. 223 223 */ 224 #define MONDO_GROWISOFS_NONBOOT "growisofs -use-the-force-luke -J "MONDO_MKISOFS" -V _CD#_ -v"224 #define MONDO_GROWISOFS_NONBOOT "growisofs -use-the-force-luke "MONDO_MKISOFS 225 225 226 226 /**
Note:
See TracChangeset
for help on using the changeset viewer.