Changeset 964


Ignore:
Timestamp:
Nov 23, 2006, 5:00:10 PM (12 years ago)
Author:
bruno
Message:

Improved again mindi's messages

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r963 r964  
    422422    mkdir -p $mountpoint
    423423    dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)"
    424     mke2fs -N 12 -F $imagefile > $MINDI_TMP/mke2fs.$$ 2>> $MINDI_TMP/mke2fs.$$
    425     [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.$$
    426     rm -f $MINDI_TMP/mke2fs.$$
     424    mke2fs -N 12 -F $imagefile >> $LOGFILE 2>> $LOGFILE
    427425    mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $imagefile to $mountpoint! The reason may be missing support for loopfs or ext2 (or both) in the running kernel."
    428426    mv $tarball $mountpoint/
     
    16781676    mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
    16791677    dd if=/dev/zero of=$image bs=1k count=$disksize &> /dev/null
    1680     mke2fs -N 26 -F $image > /dev/null
     1678    mke2fs -N 26 -F $image &> /dev/null
    16811679    mkdir -p $mtpt
    16821680    mount -o loop $image $mtpt
     
    18151813    dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
    18161814    if [ "$ARCH" = "ia64" ] ; then
    1817         mkdosfs $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
    1818     t=vfat
    1819     else
    1820         mke2fs -N 26 -m 0 -F $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
    1821     t=ext2
    1822     fi
    1823     [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
    1824     rm -f $MINDI_TMP/mke2fs.log
     1815        mkdosfs $imagefile >> $LOGFILE 2>> $LOGFILE
     1816        t=vfat
     1817    else
     1818        mke2fs -N 26 -m 0 -F $imagefile >> $LOGFILE 2>> $LOGFILE
     1819        t=ext2
     1820    fi
    18251821    mount -t $t -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
    1826 # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     1822    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
    18271823    mkdir -p $mountpoint/etc
    18281824    if [ "$ARCH" != "ia64" ] ; then
     
    19731969    else
    19741970        dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
    1975         mkfs.vfat $imagefile 2>> $LOGFILE
    1976         syslinux $imagefile 2>> $LOGFILE
     1971        mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
     1972        syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
    19771973    fi
    19781974    mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
     
    21672163    cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
    21682164    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
    2169     [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     2165    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
    21702166    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
    21712167    ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
     
    25392535    echo -en "..."
    25402536    mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE
    2541 
    2542     [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
    2543     rm -f $MINDI_TMP/mke2fs.log
    25442537    echo -en "..."
    25452538    mkdir -p $mountpoint
     
    29912984    else
    29922985        if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
    2993             LogIt "WARNING - failed to create 1.72MB boot image. Please reduce your kernel's size"
    2994             LogIt "if you want to make a 1.72MB floppy disk."
     2986            LogIt "WARNING - failed to create 1.72MB boot image."
     2987            LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
    29952988        fi
    29962989        if ! PrepareBootDiskImage_LILO $CACHE_LOC 2880 $kernelpath $ramdisk_size ;  then
    29972990            LogIt "WARNING - failed to create 2.88MB floppy disk image."
    2998             LogIt "Please reduce your kernel's size"
    2999             LogIt "if you want to make a 2.88MB floppy disk."
     2991            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    30002992            PrepareBootDiskImage_LILO $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
    30012993        fi
     
    30032995else
    30042996    if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
    3005         LogIt "WARNING - failed to create 1.72MB boot image. Please reduce your kernel's size"
    3006         LogIt "if you want to make a 1.72MB floppy disk."
     2997        LogIt "WARNING - failed to create 1.72MB boot image."
     2998        LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
    30072999        if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
    30083000            LogIt "WARNING - failed to create 2.88MB floppy disk image."
    3009             LogIt "Please reduce your kernel's size"
    3010             LogIt "if you want to make a 2.88MB floppy disk."
     3001            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    30113002            PrepareBootDiskImage_SYSLINUX $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
    30123003        fi
Note: See TracChangeset for help on using the changeset viewer.