Changeset 3406 in MondoRescue


Ignore:
Timestamp:
Aug 6, 2015, 8:10:25 AM (4 years ago)
Author:
Bruno Cornec
Message:

Homogeneize bootroot image name

In bth mindi and mondo use systematically mindi-bootroot.img as the name
of the bootable image used to make CD. Simpler and always the same for
all cases.

Location:
branches/3.2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3405 r3406  
    15041504        $ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
    15051505    else
    1506         $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c images/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     1506        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.img -c images/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
    15071507    fi
    15081508    if [ "$?" -ne "0" ] ; then
     
    18611861    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/initrd.img `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into initrd.img; are you SURE your kernel supports loopfs?"
    18621862    echo -en "..."
    1863     imagefile=$MINDI_TMP/mindi-bootroot.$BOOT_SIZE.img
     1863    imagefile=$MINDI_TMP/mindi-bootroot.img
    18641864    mkdir -p $mountpoint
    18651865    dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
     
    18721872
    18731873    # Only move it now to its final destination and use it now
    1874     mv $imagefile $imagesdir
    1875     imagefile=$imagesdir/mindi-bootroot.$BOOT_SIZE.img
     1874    mv $imagefile $MINDI_CACHE
     1875    imagefile=$MINDI_CACHE/mindi-bootroot.img
    18761876
    18771877    mount -t vfat -o loop $imagefile $mountpoint || LogAll "ERROR: Cannot mount (PBDI)"
  • branches/3.2/mondo-doc/mindi.8

    r2870 r3406  
    153153initrd image for bootable ISO image.
    154154.TP
    155 .I /var/cache/mindi/mindi-boot.F.img
     155.I /var/cache/mindi/mindi-bootroot.img
    156156.B mindi
    157 boot media of size F [KB].
    158 .TP
    159 .I /var/cache/mindi/mindi-root.F.img
    160 .B mindi
    161 root media of size F [KB].
    162 .TP
    163 .I /var/cache/mindi/mindi-data.N.img
    164 .B mindi
    165 data media number N for boot/root media.
     157boot and root media.
    166158.TP
    167159.I /var/cache/mindi/mindi.iso
  • branches/3.2/mondo/src/common/libmondo-archive.c

    r3404 r3406  
    18071807#else
    18081808                log_msg(1, "Non-ia64 --> lilo");
    1809                 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);
     1809                mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
    18101810                // FIXME: fixed boot size probably wrong. lilo to be removed
    18111811                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

    r3404 r3406  
    193193 * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
    194194 */
    195 #define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot."IA64_BOOT_SIZE".img -c boot.cat "
     195#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot.img -c boot.cat "
    196196
    197197/**
     
    208208 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    209209     */
    210 #define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     210#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"
    211211
    212212/**
Note: See TracChangeset for help on using the changeset viewer.