Changeset 588 in MondoRescue for trunk/mindi/mindi


Ignore:
Timestamp:
May 29, 2006, 11:47:20 AM (14 years ago)
Author:
bcornec
Message:

merge -r 560:587 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r561 r588  
    510510    if [ "$?" -ne "0" ] ; then
    511511    umount $mountpoint
    512     Die "Tarball $tarball is too big for disk! (CODI)\nTell dev team to adjust MAX_COMPRESSED_SIZE"
     512    Die "Tarball $tarball is too big for disk! (CODI)\nTell Dev Team to adjust MAX_COMPRESSED_SIZE"
    513513    fi
    514514    [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
     
    757757    pwd=`pwd`
    758758    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    759     cd $TMP_ROOT
    760     else
    761     cd /
     759        cd $TMP_ROOT
     760    else
     761        cd /
    762762    fi
    763763    if [ ! -e "$1" ] ; then
    764     LogIt "Warning - cannot search specific path '$1'\n"
    765     return 1
     764        LogIt "Warning - cannot search specific path '$1'\n"
     765        return 1
    766766    fi
    767767    modpaths=`find $1 -name $2.*o -type f`
     
    12741274    echo "echo -en \"Loading your modules...\"" >> $outfile
    12751275    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    1276     kver=$FAILSAFE_KVER
    1277     cd $TMP_ROOT
    1278     searchpath=lib/modules/$kver
     1276        kver=$FAILSAFE_KVER
     1277        cd $TMP_ROOT
     1278        searchpath=lib/modules/$kver
    12791279    else
    12801280###
     
    12911291### Sq-Modification end
    12921292###
    1293     searchpath=/lib/modules/$kver
     1293        searchpath=/lib/modules/$kver
    12941294    fi
    12951295   
     
    27852785    old_pwd=`pwd`
    27862786    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    2787     cd $TMP_ROOT
    2788     floppy_modules_path=lib/modules/$FAILSAFE_KVER
    2789     else
    2790     cd /
     2787        cd $TMP_ROOT
     2788        floppy_modules_path=lib/modules/$FAILSAFE_KVER
     2789    else
     2790        cd /
    27912791###
    27922792### Sq-Modification... Use kernel name in module path if specified.
     
    27952795        if [ "${kernelname}" != "" ]
    27962796        then
    2797           floppy_modules_path=lib/modules/${kernelname}
     2797            floppy_modules_path=lib/modules/${kernelname}
    27982798        else
    2799           floppy_modules_path=lib/modules/`uname -r`
     2799            floppy_modules_path=lib/modules/`uname -r`
    28002800        fi
    28012801###
     
    28052805    floppy_modules=""
    28062806    if [ "$disksize" -lt "2880" ] ; then
    2807         list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     2807        list_of_groovy_mods="$FLOPPY_MODS $IDE_MODS ide-scsi sr_mod cdrom isocd isofs `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
    28082808    else
    28092809        list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     
    28202820    [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"
    28212821    for i in $list_of_groovy_mods ; do
    2822     floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
     2822        floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
    28232823    done
    28242824    for i in $floppy_modules ; do
    28252825        [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
    2826     [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
    2827     echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
    2828     cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
    2829     [ "`echo "$i" | fgrep ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     2826        [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
     2827        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
     2828        cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
     2829        [ "`echo "$i" | fgrep ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
    28302830    done
    28312831#    if [ -e "/dev/.devfsd" ] ; then
     
    28992899    while [ "$diskno" -le "$noof_disks" ] ; do
    29002900        cd $minidir_root/$diskno || LogIt "Warning - cannot cd to $minidir_root/$diskno\n"
    2901         tar -cf - . 2>> $LOGFILE | gzip -9 > $tardir/$diskno.tar.gz || Die "Can't tar/gzip disk#$diskno; please tell dev team -exactly- what the errors where."
     2901        tar -cf - . 2>> $LOGFILE | gzip -9 > $tardir/$diskno.tar.gz || Die "Can't tar/gzip disk#$diskno; please tell Dev Team -exactly- what the errors where."
    29022902        diskno=$(($diskno+1))
    29032903        echo -n "..."
Note: See TracChangeset for help on using the changeset viewer.