Changeset 3539


Ignore:
Timestamp:
Mar 22, 2016, 1:50:08 AM (20 months ago)
Author:
bruno
Message:
  • Review of mkisofs options to mimic what mindi now does and generation is now identical for UEFI
  • Image still not seen as bootable for the server
Location:
branches/3.2/mondo/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/common/libmondo-archive.c

    r3527 r3539  
    17101710        if (bkpinfo->nonbootable_backup) {
    17111711            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);
    17131713            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
    17141714            mr_free(full_isofs_cmd);
     
    17261726#ifdef __IA64__
    17271727                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);
    17291729                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
    17301730                mr_free(full_isofs_cmd);
    17311731#else
    17321732                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);
    17341734                // FIXME: fixed boot size probably wrong. lilo to be removed
    17351735                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     
    17421742                    if (strstr(isofs_cmd,"xorriso")) {
    17431743                        /*  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);
    17451745                    } else {
    1746                         mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
     1746                        mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
    17471747                    }
    17481748                } else {
    17491749                    mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
    17501750                }
    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);
    17521752                mr_free(uefistr);
    17531753
  • branches/3.2/mondo/src/common/libmondo-devices.c

    r3511 r3539  
    31233123
    31243124    if (bkpinfo->boot_type == UEFI) {
    3125         /*  hardcoded for now. We can for sure do abetter job here ! */
     3125        /*  hardcoded for now. We can for sure do a better job here ! */
    31263126        /* RHEL, SLES, Mageia, Debian, Ubuntu use grub as boot loader as it seems for UEFI */
    31273127        return ('G');
  • branches/3.2/mondo/src/common/libmondo-tools.c

    r3514 r3539  
    499499#ifdef __IA64__
    500500    {
    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);
    502502    }
    503503#else
    504504    {
    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);
    506506    }
    507507#endif
     
    510510                if (strstr(isofs_cmd,"xorriso")) {
    511511                    /*  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);
    513513                } else {
    514                     mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
     514                    mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
    515515                }
    516516            } else {
     
    518518            }
    519519
    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);
    521521        }
    522522        mr_free(isofs_cmd);
  • branches/3.2/mondo/src/include/my-stuff.h

    r3514 r3539  
    179179#define MONDO_GENISOIMAGE_CMD "genisoimage"
    180180#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_SUFFIX
     181#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 "
    185185
    186186/**
    187187 * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image.
    188188 */
    189 #define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot "
     189#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS
    190190
    191191/**
     
    197197 * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
    198198 */
    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 "
    200200
    201201/**
     
    207207 * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
    208208 */
    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
    210210
    211211/**
    212212 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    213213     */
    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
    215215
    216216/**
    217217 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    218218     */
    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
    220220
    221221/**
    222222 * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
    223223 */
    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
    225225
    226226/**
Note: See TracChangeset for help on using the changeset viewer.