Changeset 1794 in MondoRescue

Timestamp:

Nov 14, 2007, 1:09:56 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Improves ia64 support for bootable image build
• Fix a potential problem with ramdisk_blocksize param

File:

• branches/2.2.5/mindi/mindi (modified) (3 diffs)

branches/2.2.5/mindi/mindi

@@ -2067 +2067 @@
         el=`find /boot/efi -name elilo.efi`
         cp $el $mountpoint
-        cp $liloconf $mountpoint/elilo.efi $mountpoint/efi/boot
+        cp $liloconf $mountpoint
         if [ $mountefi -eq 1 ]; then
             umount /boot/efi 2>&1 > /dev/null
@@ -2125 +2125 @@
     echo "Free space left on floppy = $free_space KB" >> $LOGFILE
     echo "Max kernel size on $disksize KB floppy (est'd) = $max_kernel_size K" >> $LOGFILE
-# make it bootable
+    # make it bootable
     rm -f $mountpoint/zero
     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
     if [ "$disksize" -gt "2880" ] && [ ! "$KERN_DISK_MADE" ] ; then
         if [ "$ARCH" != "ia64" ] ; then
-        $LILO_EXE $LILO_OPTIONS -r $mountpoint >> $LOGFILE 2>> $LOGFILE
+            $LILO_EXE $LILO_OPTIONS -r $mountpoint >> $LOGFILE 2>> $LOGFILE
         else
             /bin/true
         fi
     elif [ ! "$KERN_DISK_MADE" ] ; then
-# 12/28/2001 - if 1.72MB floppy then don't use LILO's optimizations at all
+        # 12/28/2001 - if 1.72MB floppy then don't use LILO's optimizations at all
         $LILO_EXE -r $mountpoint >> $LOGFILE 2>> $LOGFILE
     else
@@ -2978 +2978 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null
-        bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2`
+        bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
         ADDITIONAL_BOOT_PARAMS="$ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs"
         gzip -v9 ${rdz_fname}.tmp > $rdz_fname 2> /dev/null