Changeset 3494


Ignore:
Timestamp:
Jan 5, 2016, 1:45:53 AM (23 months ago)
Author:
bruno
Message:

Update mondo to point to the isolinux subdir now created for ISO images and use the images subdir also for coherency for boot.cat files

Location:
branches/3.2/mondo/src
Files:
2 edited

Legend:

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

    r3466 r3494  
    17501750#else
    17511751                log_msg(1, "Non-ia64 --> lilo");
    1752                 mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
     1752                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);
    17531753                // FIXME: fixed boot size probably wrong. lilo to be removed
    17541754                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
  • branches/3.2/mondo/src/include/my-stuff.h

    r3492 r3494  
    184184 * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image.
    185185 */
    186 #define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 "
     186#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot -b isolinux/isolinux.bin -c isolinux/boot.cat -boot-load-size 4 "
    187187
    188188/**
     
    194194 * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
    195195 */
    196 #define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot.img -c boot.cat "
     196#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat "
    197197
    198198/**
     
    204204 * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
    205205 */
    206 #define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
     206#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux/isolinux.bin --boot-info-table -c isolinux/boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
    207207
    208208/**
    209209 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    210210     */
    211 #define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-bootroot.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     211#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
    212212
    213213/**
    214214 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    215215     */
    216 #define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     216#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux/isolinux.bin -c isolinux/boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
    217217
    218218/**
Note: See TracChangeset for help on using the changeset viewer.