Changeset 2626


Ignore:
Timestamp:
Apr 28, 2010, 2:59:33 AM (9 years ago)
Author:
bruno
Message:

Avoid to have multiple similar calls to mkisofs by using macros

Location:
branches/2.2.9/mondo/src
Files:
3 edited

Legend:

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

    r2578 r2626  
    18591859            if (bkpinfo->make_cd_use_lilo) {
    18601860                log_msg(1, "make_cd_use_lilo = TRUE");
    1861 // FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
    1862 // and add ' .' at end
    18631861#ifdef __IA64__
    18641862                log_msg(1, "IA64 --> elilo");
    1865                 res = eval_call_to_make_ISO("mkisofs -no-emul-boot -b images/mindi-bootroot."
    1866                                             IA64_BOOT_SIZE
    1867                                             ".img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
     1863                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' _CD#_ .",
    18681864                                            destfile,
    18691865                                            g_current_media_number,
     
    18711867                                            message_to_screen);
    18721868#else
    1873 // FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
    1874 // and add ' .' at end
    18751869                log_msg(1, "Non-ia64 --> lilo");
    18761870                res =
    1877                     eval_call_to_make_ISO("mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
     1871                    // FIXME: fixed boot size probably wrong. lilo to be removed
     1872                    eval_call_to_make_ISO(MONDO_MKISOFS"-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J _CD#_ .",
    18781873                                          destfile, g_current_media_number,
    18791874                                          MONDO_LOGFILE,
     
    18841879                log_msg(1, "Isolinux");
    18851880                res =
    1886                     eval_call_to_make_ISO("mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
     1881                    eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' _CD#_ .",
    18871882                                          destfile, g_current_media_number,
    18881883                                          MONDO_LOGFILE,
  • branches/2.2.9/mondo/src/common/libmondo-tools.c

    r2624 r2626  
    514514#ifdef __IA64__
    515515    {
    516         mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
     516        mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_ELILO);
    517517    }
    518518#else
    519519    {
    520         mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
     520        mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_LILO);
    521521    }
    522522#endif
    523523        else
    524524        {
    525             mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
     525            mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_SYSLINUX);
    526526        }
    527527        if (bkpinfo->manual_cd_tray) {
  • branches/2.2.9/mondo/src/include/my-stuff.h

    r2470 r2626  
    169169
    170170
     171#define MONDO_MKISOFS "mkisofs -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V "
    171172/**
    172173 * @c mkisofs command to generate a nonbootable CD, except for -o option and the directory to image.
    173174 */
    174 #define MONDO_MKISOFS_NONBOOT   "mkisofs -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
     175#define MONDO_MKISOFS_NONBOOT   MONDO_MKISOFS"_CD#_"
    175176
    176177/**
    177178 * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image.
    178179 */
    179 #define MONDO_MKISOFS_REGULAR_SYSLINUX  "mkisofs -J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
     180#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 "
    180181
    181182/**
    182183 * @c mkisofs command to generate a bootable CD using LILO, except for -o option and the directory to image.
    183184 */
    184 #define MONDO_MKISOFS_REGULAR_LILO      "mkisofs -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
     185#define MONDO_MKISOFS_REGULAR_LILO      MONDO_MKISOFS_REGULAR_SYSLINUX
    185186
    186187/**
    187188 * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
    188189 */
    189 // Should replace 8192 by IA64_BOOT_SIZE
    190 #define MONDO_MKISOFS_REGULAR_ELILO      "mkisofs -no-emul-boot -b images/mindi-bootroot.8192.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
     190#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot."IA64_BOOT_SIZE".img -c boot.cat "
    191191
    192192/**
Note: See TracChangeset for help on using the changeset viewer.