Changeset 2073 in MondoRescue


Ignore:
Timestamp:
Dec 8, 2008, 1:24:15 PM (12 years ago)
Author:
Bruno Cornec
Message:
  • fdomain may prevent booting at restore time, so propose it as example of DENY_MODS
  • adds a new target to MakeBootConfFile?, in order to support isolinux and syslinux separately. That should allow creation of USB keys correctly, as syslinux syntax in syslinux.cfg is without / for kernel and initrd pathnames, where we use a full path syntax for CD/Isolinux.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.8/mindi/mindi

    r2072 r2073  
    5959EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 raid456 lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
    6060# Replace with that line for HP OCMP e.g.
    61 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu"
     61#DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
    6262DENY_MODS="kqemu"
    6363# Force some modules to be included
     
    13111311        cp $MINDI_TMP/initrd.img $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy initrd.img ($MINDI_TMP/initrd.img) to $MONDO_ROOT/initrd.img. Did you run out of disk space?"
    13121312    fi
    1313     MakeBootConfFile syslinux > $MINDI_TMP/iso/isolinux.cfg
     1313    MakeBootConfFile isolinux > $MINDI_TMP/iso/isolinux.cfg
    13141314    if [ "$ARCH" != "ia64" ] ; then
    13151315        cp $ISOLINUX $MINDI_TMP/iso/isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso - did you run out of disk space?"
     
    15551555            outstr="image=/vmlinuz\n\tlabel=$i\n\tinitrd=/initrd.img\n\troot=/dev/ram0 append=\" rw ramdisk_size=$ramdisk_size $ooo_mode $ADDITIONAL_BOOT_PARAMS \"\n"
    15561556        else
    1557             outstr="label $i\n\tkernel /vmlinuz\n\tappend initrd=/initrd.img root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo}_mode $ADDITIONAL_BOOT_PARAMS\n"
     1557            ps="/"
     1558            if [ "$type" = "syslinux" ]; then
     1559                ps=""
     1560            fi
     1561            outstr="label $i\n\tkernel ${ps}vmlinuz\n\tappend initrd=${ps}initrd.img root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo}_mode $ADDITIONAL_BOOT_PARAMS\n"
    15581562        fi
    15591563        echo -en "$outstr"
     
    15631567        if [ "$type" = "elilo" ]; then
    15641568            echo -en "image=/memtest.bin\n\tlabel=memtest\n"
    1565             echo -en "image=/memdisk\n\tlabel=memtest\nappend=\"initrd=memtest.img\"\n"
     1569            echo -en "image=/memdisk\n\tlabel=memdisk\nappend=\"initrd=memtest.img\"\n"
    15661570        else
    1567             echo -en "label memtest\n\tkernel /memtest.bin\n"
    1568             echo -en "label=memtest\n\tkernel /memdisk\nappend initrd=memtest.img\n"
     1571            ps="/"
     1572            if [ "$type" = "syslinux" ]; then
     1573                ps=""
     1574            fi
     1575            echo -en "label memtest\n\tkernel ${ps}memtest.bin\n"
     1576            echo -en "label memdisk\n\tkernel ${ps}memdisk\nappend initrd=${ps}memtest.img\n"
    15691577        fi
    15701578    fi
     
    16781686
    16791687
    1680 PrepareBootDiskImage_SYSLINUX() {
     1688PrepareBootDiskImage_ISOLINUX() {
    16811689    local imagesdir dev imagefile mountpoint fname i kernelpath cfg_file testpath options retval outstr old_pwd ooo max_kernel_size bootimage
    16821690    imagesdir=$MINDI_CACHE
     
    17071715    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
    17081716    MakeMessageFile > $mountpoint/message.txt
    1709     MakeBootConfFile syslinux > $mountpoint/syslinux.cfg
     1717    MakeBootConfFile isolinux > $mountpoint/syslinux.cfg
    17101718    echo "Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..." >> $LOGFILE
    17111719    cp -f $MINDI_TMP/initrd.img $mountpoint/initrd.img 2>> $LOGFILE
     
    28192827    PrepareBootDiskImage_LILO $kernelpath || Die "Failed to create ia64 image disk image."
    28202828else
    2821     PrepareBootDiskImage_SYSLINUX $kernelpath || Die "Failed to create $ramdisk_size MB disk image."
     2829    PrepareBootDiskImage_ISOLINUX $kernelpath || Die "Failed to create $ramdisk_size MB disk image."
    28222830fi
    28232831
Note: See TracChangeset for help on using the changeset viewer.