Changeset 1794 for branches/2.2.5


Ignore:
Timestamp:
Nov 14, 2007, 1:09:56 AM (12 years ago)
Author:
bruno
Message:
  • Improves ia64 support for bootable image build
  • Fix a potential problem with ramdisk_blocksize param
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1791 r1794  
    20672067        el=`find /boot/efi -name elilo.efi`
    20682068        cp $el $mountpoint
    2069         cp $liloconf $mountpoint/elilo.efi $mountpoint/efi/boot
     2069        cp $liloconf $mountpoint
    20702070        if [ $mountefi -eq 1 ]; then
    20712071            umount /boot/efi 2>&1 > /dev/null
     
    21252125    echo "Free space left on floppy = $free_space KB" >> $LOGFILE
    21262126    echo "Max kernel size on $disksize KB floppy (est'd) = $max_kernel_size K" >> $LOGFILE
    2127 # make it bootable
     2127    # make it bootable
    21282128    rm -f $mountpoint/zero
    21292129    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
    21302130    if [ "$disksize" -gt "2880" ] && [ ! "$KERN_DISK_MADE" ] ; then
    21312131        if [ "$ARCH" != "ia64" ] ; then
    2132         $LILO_EXE $LILO_OPTIONS -r $mountpoint >> $LOGFILE 2>> $LOGFILE
     2132            $LILO_EXE $LILO_OPTIONS -r $mountpoint >> $LOGFILE 2>> $LOGFILE
    21332133        else
    21342134            /bin/true
    21352135        fi
    21362136    elif [ ! "$KERN_DISK_MADE" ] ; then
    2137 # 12/28/2001 - if 1.72MB floppy then don't use LILO's optimizations at all
     2137        # 12/28/2001 - if 1.72MB floppy then don't use LILO's optimizations at all
    21382138        $LILO_EXE -r $mountpoint >> $LOGFILE 2>> $LOGFILE
    21392139    else
     
    29782978        umount $mountpoint || Die "Cannot unmount $tempfile"
    29792979        dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null
    2980         bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2`
     2980        bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
    29812981        ADDITIONAL_BOOT_PARAMS="$ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs"
    29822982        gzip -v9 ${rdz_fname}.tmp > $rdz_fname 2> /dev/null
Note: See TracChangeset for help on using the changeset viewer.