Changeset 956 for trunk/mindi/mindi


Ignore:
Timestamp:
Nov 21, 2006, 1:42:46 AM (12 years ago)
Author:
bruno
Message:

merge -r938:954 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r939 r956  
    6161WRITE_MINDI_CD="$mindi_write_cd"
    6262# TBC
    63 CACHEDIR="$mindi_images_dir"
     63CACHE_LOC="$mindi_images_dir"
    6464FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
    6565TMP_ROOT="$mindi_tmp_dir"
     
    102102BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
    103103FDISK=$MINDI_SBIN/parted2fdisk
    104 FDISKLOG=$MONDOTMP/parted2fdisk.log
    105 touch $FDISKLOG
    106104
    107105# Using a config file allow to overwrite some values
     
    112110
    113111# Now we can create what we nedd
    114 MONDOTMP=`mktemp -d $TMPDIR/mondobuild.XXXXXXXXXX`
    115 mkdir -p $MONDOTMP
     112MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
     113mkdir -p $MINDI_TMP
     114
     115FDISKLOG=$MINDI_TMP/parted2fdisk.log
     116
     117# Purge from potential old run
     118rm -rf $CACHE_LOC/* 2> /dev/null
    116119mkdir -p $CACHE_LOC
    117120# ----------------------------------------------------------------------------
     
    278281
    279282    sliceno=0
    280     scratchfile=$MONDOTMP/blah.$$.dat
     283    scratchfile=$MINDI_TMP/blah.$$.dat
    281284    cp -f $filename $scratchfile || Die "CUACF -- cannot copy $filename to $scratchfile - did you run out of disk space?"
    282285    [ "`head $scratchfile -n1 | grep -F "bin/sh"`" != "" ] && StripComments $scratchfile "-$filename-"
     
    341344                BIGNO=$(($BIGNO+1))
    342345            else
    343                 cp --parents -Rdf $incoming $outdir || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
     346                cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
    344347                if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
    345348                    gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming\n"
     
    430433    noof_disks=$4
    431434
    432     mountpoint=$MONDOTMP/mountpoint.$$
     435    mountpoint=$MINDI_TMP/mountpoint.$$
    433436    mkdir -p $mountpoint
    434437    dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)\n"
    435     mke2fs -N 12 -F $imagefile > $MONDOTMP/mke2fs.$$ 2>> $MONDOTMP/mke2fs.$$
    436     [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.$$
    437     rm -f $MONDOTMP/mke2fs.$$
     438    mke2fs -N 12 -F $imagefile > $MINDI_TMP/mke2fs.$$ 2>> $MINDI_TMP/mke2fs.$$
     439    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.$$
     440    rm -f $MINDI_TMP/mke2fs.$$
    438441    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."
    439442    mv $tarball $mountpoint/
     
    471474    my_partitions=`mount | grep -F $$ | cut -f1 -d' '`
    472475    [ "$my_partitions" != "" ] && umount $my_partitions
    473     # Clean temporary files
    474     rm -Rf $MONDOTMP $FDISKLOG
     476    # Clean temporary files only when standalone mindi
     477    if [ _"$MINDI_TMP" != _"$MONDO_TMP" ]; then
     478        rm -Rf $MINDI_TMP
     479    fi
    475480    exit $1
    476481}
     
    485490
    486491    # Creates a tar file containing all required files
    487     for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log $FDISKLOG ; do
    488         [ -e "$i" ] && cp -f $i $MONDOTMP
     492    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
     493        [ -e "$i" ] && cp -f $i $MINDI_TMP
    489494    done
    490495    rm -f $TMPDIR/mindi.err.*.tgz
    491     tar -cf - $MONDOTMP | gzip -9 > $TMPDIR/mindi.err.$$.tgz
     496    tar -cf - $MINDI_TMP | gzip -9 > $TMPDIR/mindi.err.$$.tgz
    492497    LogIt "Please e-mail a copy of $TMPDIR/mindi.err.$$.tgz to the mailing list.\n"
    493498    LogIt "See http://www.mondorescue.org for more information.\n"
     
    683688    pwd=`pwd`
    684689    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    685         cd $MONDOTMP
     690        cd $MINDI_TMP
    686691    else
    687692        cd /
     
    706711    echo -en "Analyzing dependency requirements"
    707712    outfile=$1
    708     tempfile=$MONDOTMP/$$.txt
     713    tempfile=$MINDI_TMP/$$.txt
    709714    incoming=`ReadLine`
    710715
     
    829834        mkdir -p $bigdir/sbin
    830835        mkdir -p $bigdir/bin
    831         if [ -e "$MONDOTMP/post-nuke.tgz" ] ; then
     836        if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
    832837            LogIt "\nIncorporating post-nuke tarball\n"
    833838            old_pwd=`pwd`
    834839            cd $bigdir
    835             tar -zxf $MONDOTMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball\n"
     840            tar -zxf $MINDI_TMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball\n"
    836841            cd $old_pwd
    837842        fi
    838         if cp -f $MONDOTMP/mondo*restore $bigdir/usr/bin ; then
     843        if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin ; then
    839844            LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
    840845        else
    841             LogIt "Cannot find mondo*restore in mondo's tempdir, $MONDOTMP\n"
     846            LogIt "Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP\n"
    842847            LogIt "I bet you've got a spare copy of Mondo or Mindi floating around on your system.\n"
    843848            LogIt "If Mindi was called by Mondo then send me a bug report.\n It not, type 'ps ax' to see which Mondo-related process is still running;\n then kill it. :-)\n Finally, run Mindi again."
    844849            Die "Odd."
    845850        fi
    846         cp -f $MONDOTMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
    847         if [ -e "$MONDOTMP/NFS-DEV" ] ; then
     851        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
     852        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    848853            LogIt "Incorporating NFS-related settings\n"
    849854            for r in NFS-* ISO-PREFIX ; do
    850                 cp -f $MONDOTMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
     855                cp -f $MINDI_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
    851856                echo "Copying $r to ramdisk" >> $LOGFILE
    852857            done
     
    915920    incoming=`ReadLine`
    916921    pwd=`pwd`
    917     cd $MONDOTMP
     922    cd $MINDI_TMP
    918923    while [ "$incoming" != "" ] ; do
    919924        stub=`basename $incoming`
     
    10821087    echo "datestamp `date`" >> $outfile
    10831088    [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
    1084     AddFileToCfgIfExists $MONDOTMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
    1085     AddFileToCfgIfExists $MONDOTMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
    1086     AddFileToCfgIfExists $MONDOTMP/NFS-CLIENT-BROADCAST nfs-client-broadcast $outfile
    1087     AddFileToCfgIfExists $MONDOTMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
    1088     AddFileToCfgIfExists $MONDOTMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
    1089     AddFileToCfgIfExists $MONDOTMP/NFS-SERVER-PATH   nfs-server-path   $outfile
    1090     AddFileToCfgIfExists $MONDOTMP/NFS-DEV           nfs-dev           $outfile
    1091     AddFileToCfgIfExists $MONDOTMP/NFS-SERVER-IPADDR nfs-server-ipaddr $outfile
    1092     AddFileToCfgIfExists $MONDOTMP/ISO-DEV           iso-dev           $outfile
    1093     AddFileToCfgIfExists $MONDOTMP/ISO-MNT           iso-mnt           $outfile
    1094     AddFileToCfgIfExists $MONDOTMP/ISO-PREFIX        iso-prefix        $outfile
    1095     AddFileToCfgIfExists $MONDOTMP/ISODIR            isodir            $outfile
    1096     AddFileToCfgIfExists $MONDOTMP/BOOTLOADER.DEVICE bootloader.device $outfile
    1097     AddFileToCfgIfExists $MONDOTMP/BOOTLOADER.NAME   bootloader.name   $outfile
    1098     AddFileToCfgIfExists $MONDOTMP/KEYMAP-LIVES-HERE keymap-lives-here $outfile
    1099     AddFileToCfgIfExists $MONDOTMP/TAPEDEV-HAS-DATA-DISKS tapedev-has-data-disks $outfile
    1100     AddFileToCfgIfExists $MONDOTMP/BACKUP-MEDIA-TYPE backup-media-type $outfile
    1101     AddFileToCfgIfExists $MONDOTMP/DIFFERENTIAL      differential      $outfile
     1089    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
     1090    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
     1091    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-BROADCAST nfs-client-broadcast $outfile
     1092    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
     1093    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
     1094    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-PATH   nfs-server-path   $outfile
     1095    AddFileToCfgIfExists $MINDI_TMP/NFS-DEV           nfs-dev           $outfile
     1096    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-IPADDR nfs-server-ipaddr $outfile
     1097    AddFileToCfgIfExists $MINDI_TMP/ISO-DEV           iso-dev           $outfile
     1098    AddFileToCfgIfExists $MINDI_TMP/ISO-MNT           iso-mnt           $outfile
     1099    AddFileToCfgIfExists $MINDI_TMP/ISO-PREFIX        iso-prefix        $outfile
     1100    AddFileToCfgIfExists $MINDI_TMP/ISODIR            isodir            $outfile
     1101    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
     1102    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.NAME   bootloader.name   $outfile
     1103    AddFileToCfgIfExists $MINDI_TMP/KEYMAP-LIVES-HERE keymap-lives-here $outfile
     1104    AddFileToCfgIfExists $MINDI_TMP/TAPEDEV-HAS-DATA-DISKS tapedev-has-data-disks $outfile
     1105    AddFileToCfgIfExists $MINDI_TMP/BACKUP-MEDIA-TYPE backup-media-type $outfile
     1106    AddFileToCfgIfExists $MINDI_TMP/DIFFERENTIAL      differential      $outfile
     1107    AddFileToCfgIfExists $MINDI_TMP/ACL      acl      $outfile
     1108    AddFileToCfgIfExists $MINDI_TMP/XATTR      xattr      $outfile
    11021109}
    11031110
     
    11121119    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    11131120        kver=$FAILSAFE_KVER
    1114         cd $MONDOTMP
     1121        cd $MINDI_TMP
    11151122        searchpath=lib/modules/$kver
    11161123    else
     
    11361143    # Make temporary modprobe.conf file if we are told so
    11371144    if [ $tmpmodprobe_flag == "Y" ] ; then
    1138         infile="$MONDOTMP/modprobe.conf.mindi"
     1145        infile="$MINDI_TMP/modprobe.conf.mindi"
    11391146        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
    11401147    else
     
    11771184
    11781185# scratchdir, mountlist(OUT)
    1179     scratchdir=$MONDOTMP
     1186    scratchdir=$MINDI_TMP
    11801187    mountlist=$1
    11811188
     
    14511458    rm -f $1.tmp
    14521459    if [ "$CDRECOVERY" != "yes" ] ; then
    1453         if [ -e "$MONDOTMP/NFS-DEV" ] ; then
     1460        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    14541461            echo -en "Press <enter> to continue.\n" >> $1
    1455         elif [ ! "$MONDOTMP" ] ; then
     1462        elif [ ! "$MINDI_TMP" ] ; then
    14561463            echo -en "FYI, this is _not_ a Mondo Rescue CD.\n" >> $1
    14571464            if [ -e "$MINDI_LIB/memtest.img" ] ; then
     
    15331540        [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
    15341541    fi
    1535     if [ ! "$MONDOTMP" ] ; then
     1542    if [ ! "$MINDI_TMP" ] ; then
    15361543        LogIt "NB: Mindi's bootable CD always uses isolinux.\n"
    15371544        LogIt "For a bootable CD w/LILO, please use Mondo.\n"
    15381545    fi
    1539     rm -Rf $MONDOTMP/iso
    1540     mkdir -p $MONDOTMP/iso/{images,archives,isolinux}
    1541     cp -f $1/*.img $1/*.gz $MONDOTMP/iso/images || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MONDOTMP/iso/images\n"
     1546    rm -Rf $MINDI_TMP/iso
     1547    mkdir -p $MINDI_TMP/iso/{images,archives,isolinux}
     1548    cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images\n"
    15421549    old_pwd=`pwd`
    1543     cd $MONDOTMP/iso
     1550    cd $MINDI_TMP/iso
    15441551    mkdir -p $MONDO_ROOT/iso/isolinux
    15451552    echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
    1546     cp $MINDI_LIB/mem{test,disk}* $MONDO_ROOT 2>> $LOGFILE
    15471553    for i in memdisk memtest.bin memtest.img ; do
    1548     j=$MINDI_LIB/$i
    1549     k=$MONDOTMP/iso/isolinux
    1550     if [ -e "$j" ] ; then
    1551         LogIt "Copying $j to $k\n"
    1552         cp -f $j $k || Die "Failed to copy $j to $k"
    1553         cp -f $j $MONDOTMP || Die "Failed to copy $j to $k"
    1554     fi
    1555     done
    1556     MakeSyslinuxMessageFile $MONDOTMP/iso/isolinux/message.txt
    1557     cp $kernelpath $MONDOTMP/iso/isolinux/vmlinuz || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
    1558     cp $MONDOTMP/mindi.rdz $MONDOTMP/iso/isolinux/initrd.img
    1559     cp $MONDOTMP/mindi.rdz $CACHE_LOC/initrd.img
     1554        j=$MINDI_LIB/$i
     1555        k=$MINDI_TMP/iso/isolinux
     1556        if [ -e "$j" ] ; then
     1557            LogIt "Copying $j to $k\n"
     1558            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
     1559            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
     1560            cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
     1561        fi
     1562    done
     1563    MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
     1564    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
     1565    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img
     1566    cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img
    15601567    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
    1561     cd $MONDOTMP/iso/isolinux
    1562     cat $iso_cfg_file | HackSyslinuxFile $ramdisk_size $MONDOTMP/iso > isolinux.cfg || Die "Cannot copy isolinux.cfg from mindi_home to tmp_root - did you run out of disk space?"
    1563     if [ -e "$MONDOTMP/NFS-DEV" ] ; then
     1568    cd $MINDI_TMP/iso/isolinux
     1569    cat $iso_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/iso > isolinux.cfg || Die "Cannot copy isolinux.cfg from mindi_home to tmp_root - did you run out of disk space?"
     1570    if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    15641571        mv isolinux.cfg isolinux.cfg.old
    15651572        sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
    15661573    fi
    15671574    if [ "$ARCH" != "ia64" ] ; then
    1568         cp $ISOLINUX isolinux.bin || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
     1575        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
    15691576        cp $ISOLINUX ../
    15701577    fi
    1571     cd $MONDOTMP/iso
     1578    cd $MINDI_TMP/iso
    15721579    if [ "$ARCH" != "ia64" ] ; then
    1573         cp -f $MONDOTMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
     1580        cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2> /dev/null || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
    15741581    fi
    15751582    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
    15761583    if [ "$ARCH" != "ia64" ] ; then
    1577         mkisofs -U -J -r -o $CACHEDIR/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> /tmp/$$.mk
    1578     else
    1579         mkisofs -J -r -o $CACHEDIR/mindi.iso -b images/mindi-bootroot.$IA64_BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> /tmp/$$.mk
     1584        mkisofs -U -J -r -o $CACHE_LOC/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
     1585    else
     1586        mkisofs -J -r -o $CACHE_LOC/mindi.iso -b images/mindi-bootroot.$IA64_BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
    15801587    fi
    15811588    if [ "$?" -ne "0" ] ; then
    15821589        echo "----------- mkisofs's errors --------------" >> $LOGFILE
    1583         cat $MONDOTMP/mkisofs.log >> $LOGFILE
     1590        cat $MINDI_TMP/mkisofs.log >> $LOGFILE
    15841591        echo "mkisofs returned the following errors:-"
    1585         cat $MONDOTMP/mkisofs.log
     1592        cat $MINDI_TMP/mkisofs.log
    15861593        LogIt "Failed to create ISO image.\n"
    15871594    else
    1588         echo "Created bootable ISO image at $CACHEDIR/mindi.iso" >> $LOGFILE
    1589     fi
    1590     rm -f $MONDOTMP/mkisofs.log
     1595        echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" >> $LOGFILE
     1596    fi
     1597    rm -f $MINDI_TMP/mkisofs.log
    15911598    cd $old_pwd
    15921599}
     
    16091616        if [ "`DidMondoCallMe`" ] ; then
    16101617            if [ "$CDRECOVERY" != "yes" ] ; then
    1611                 if [ -e "$MONDOTMP/NFS-DEV" ] ; then
     1618                if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    16121619                    echo -en "Press <enter> to continue.\n"
    1613                 elif [ ! "$MONDOTMP" ] ; then
     1620                elif [ ! "$MINDI_TMP" ] ; then
    16141621                    echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
    16151622                else
     
    16371644    rand1=$RANDOM
    16381645    rand2=$RANDOM
    1639     image=$MONDOTMP/$rand1.$rand2.img
    1640     mtpt=$MONDOTMP/$rand1.$rand2.mtpt
     1646    image=$MINDI_TMP/$rand1.$rand2.img
     1647    mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
    16411648    dd if=/dev/zero of=$image bs=1k count=$disksize
    16421649    mke2fs -N 26 -F $image > /dev/null
     
    17031710        echo -en "default=RESTORE\n"
    17041711    elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
    1705         if [ -e "$MONDOTMP/NFS-DEV" ] ; then
     1712        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    17061713            echo -en "default=iso\n"
    17071714        else
     
    17241731    elif [ "$disksize" -gt "2880" ] ; then
    17251732        if [ "`DidMondoCallMe`" ] ; then
    1726             if [ -e "$MONDOTMP/NFS-DEV" ] ; then
     1733            if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    17271734                options="iso"
    17281735            else
     
    17671774    [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
    17681775    echo -en "Making "$disksize"KB boot disk..."
    1769     TurnTgzIntoRdz $MINDI_LIB/rootfs $MONDOTMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
     1776    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
    17701777    if [ "$ARCH" != "ia64" ] ; then
    17711778        [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     
    17731780    echo -en "..."
    17741781    imagefile=$imagesdir/mindi-bootroot.$disksize.img
    1775     mountpoint=$MONDOTMP/mountpoint.$$
     1782    mountpoint=$MINDI_TMP/mountpoint.$$
    17761783    mkdir -p $mountpoint
    17771784    dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
    17781785    if [ "$ARCH" = "ia64" ] ; then
    1779         mkdosfs $imagefile > $MONDOTMP/mke2fs.log 2>> $MONDOTMP/mke2fs.log
     1786        mkdosfs $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
    17801787    t=vfat
    17811788    else
    1782         mke2fs -N 26 -m 0 -F $imagefile > $MONDOTMP/mke2fs.log 2>> $MONDOTMP/mke2fs.log
     1789        mke2fs -N 26 -m 0 -F $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
    17831790    t=ext2
    17841791    fi
    1785     [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.log
    1786     rm -f $MONDOTMP/mke2fs.log
     1792    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
     1793    rm -f $MINDI_TMP/mke2fs.log
    17871794    mount -t $t -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
    17881795# copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     
    18051812    MakeLiloConfFile $disksize > $liloconf
    18061813
    1807     echo "Copying $MONDOTMP/mindi.rdz to $mountpoint..." >> $LOGFILE
    1808     cp -f $MONDOTMP/mindi.rdz $mountpoint 2>> $LOGFILE
     1814    echo "Copying $MINDI_TMP/mindi.rdz to $mountpoint..." >> $LOGFILE
     1815    cp -f $MINDI_TMP/mindi.rdz $mountpoint 2>> $LOGFILE
    18091816    if [ "$?" -ne "0" ] ; then
    1810         LogIt "Failed to copy $MONDOTMP/mindi.rdz to $mountpoint\n"
    1811         cat $MONDOTMP/mtpt.$$ >> $LOGFILE
     1817        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint\n"
     1818        cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
    18121819        LogIt "Please unload some of your modules and try again.\n"
    1813         rm -f $MONDOTMP/mtpt.$$
     1820        rm -f $MINDI_TMP/mtpt.$$
    18141821        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
    18151822        retval=$(($retval+1))
     
    18181825
    18191826    mkdir -p $mountpoint/tmp
    1820     cp -f $MONDOTMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
     1827    cp -f $MINDI_TMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
    18211828    if [ -e "$MINDI_LIB/memtest.img" ] ; then
    18221829        echo -en "image=/memtest.bin\nlabel=memtest\nn" >> $liloconf
     
    18441851        write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
    18451852        res=$(($res+$?))
    1846         cp -f $MONDOTMP/mindi.rdz $imagesdir/mindi-root.1440.img
     1853        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img
    18471854        res=$(($res+$?))
    18481855        rm -f $imagefile
     
    18851892        retval=$(($retval+1))
    18861893    fi
    1887     cp -f $liloconf $MONDOTMP/lilo.conf
     1894    cp -f $liloconf $MINDI_TMP/lilo.conf
    18881895    if [ "$ARCH" = "ia64" ] ; then
    18891896        cp `dirname $kernelpath`/*.efi $mountpoint
     
    19191926    [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
    19201927    echo -en "Making "$disksize"KB boot disk..."
    1921     TurnTgzIntoRdz $MINDI_LIB/rootfs $MONDOTMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
     1928    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
    19221929    [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
    19231930    echo -en "..."
    19241931    imagefile=$imagesdir/mindi-bootroot.$disksize.img
    1925     mountpoint=$MONDOTMP/mountpoint.$$
     1932    mountpoint=$MINDI_TMP/mountpoint.$$
    19261933    mkdir -p $mountpoint
    19271934# If I format a 1722KB data file & run syslinux on it, the resultant image
     
    19461953    [ -e "$sys_cfg_file" ] || Die "Obi Wan, word up?"
    19471954    cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
    1948     if [ -e "$MONDOTMP/NFS-DEV" ] ; then
     1955    if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    19491956        mv syslinux.cfg syslinux.cfg.orig
    19501957        sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
    19511958    fi
    19521959    cd $old_pwd
    1953     echo "Copying $MONDOTMP/mindi.rdz to $mountpoint/initrd.img..." >> $LOGFILE
    1954     cp -f $MONDOTMP/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
     1960    echo "Copying $MINDI_TMP/mindi.rdz to $mountpoint/initrd.img..." >> $LOGFILE
     1961    cp -f $MINDI_TMP/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
    19551962    if [ "$?" -ne "0" ] ; then
    1956         LogIt "Failed to copy $MONDOTMP/mindi.rdz to $mountpoint\n"
    1957         cat $MONDOTMP/mtpt.$$ >> $LOGFILE
     1963        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint\n"
     1964        cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
    19581965        LogIt "Please unload some of your modules and try again.\n"
    1959         rm -f $MONDOTMP/mtpt.$$
     1966        rm -f $MINDI_TMP/mtpt.$$
    19601967        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
    19611968        retval=$(($retval+1))
     
    19631970
    19641971    mkdir -p $mountpoint/tmp
    1965     cp -f $MONDOTMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
     1972    cp -f $MINDI_TMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
    19661973
    19671974    # copy the kernel across
     
    19841991        write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
    19851992        res=$(($res+$?))
    1986         cp -f $MONDOTMP/mindi.rdz $imagesdir/mindi-root.1440.img
     1993        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img
    19871994        res=$(($res+$?))
    19881995        rm -f $imagefile
     
    20272034    imagesdir=$1
    20282035    rm -f $imagesdir/mindi-*.img $imagesdir/[0-9]*.tar.gz $imagesdir/mindi.iso
    2029     needlist=$MONDOTMP/what-we-need.txt
    2030     bigdir=$MONDOTMP/bigdir
    2031     minidir_root=$MONDOTMP/minidir
     2036    needlist=$MINDI_TMP/what-we-need.txt
     2037    bigdir=$MINDI_TMP/bigdir
     2038    minidir_root=$MINDI_TMP/minidir
    20322039    mkdir -p $minidir_root
    20332040    mkdir -p $bigdir/usr/bin
    2034     tardir=$MONDOTMP/tardir
     2041    tardir=$MINDI_TMP/tardir
    20352042
    20362043    lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
     
    20392046    if [ "$YOUR_KERNEL_SUCKS" ]; then
    20402047        pwd=`pwd`
    2041         cd $MONDOTMP
     2048        cd $MINDI_TMP
    20422049        for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
    20432050            cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
     
    20722079    mkdir -p $bigdir/tmp
    20732080    if [ "`DidMondoCallMe`" ] ; then
    2074         MakeMondoConfigFile $MONDOTMP/mondo-restore.cfg
    2075         cp -f $MONDOTMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
     2081        MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
     2082        cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
    20762083    fi
    20772084    [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
     
    20882095
    20892096    # master boot record, too
    2090     i=`cat $MONDOTMP/BOOTLOADER.DEVICE 2> /dev/null`
     2097    i=`cat $MINDI_TMP/BOOTLOADER.DEVICE 2> /dev/null`
    20912098    if [ "$i" ] ; then
    20922099        LogIt "Backing up $i's MBR\n"
     
    20982105        LogIt "Creating /dev/boot_device ($j)\n"
    20992106        mkdir -p $bigdir/dev
    2100         cp -pRdf $j $bigdir/dev/boot_device || Die "Unable to create /dev/boot_device on ramdisk"
     2107        cp -pRdf $j $bigdir/dev/boot_device 2> /dev/null || Die "Unable to create /dev/boot_device on ramdisk"
    21012108    fi
    21022109
     
    21252132#        EXTRA_SPACE=$(($EXTRA_SPACE*2))
    21262133#    fi
    2127     MakeMountlist $MONDOTMP/mountlist.txt
     2134    MakeMountlist $MINDI_TMP/mountlist.txt
    21282135    mkdir -p $minidir_root/$noof_disks/tmp
    2129     cp -f $MONDOTMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt || Die "Cannot copy mountlist.txt from $MONDOTMP to data disk"
    2130     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDOTMP/.
     2136    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"
     2137    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/.
    21312138    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
    21322139    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     
    22762283    local tempfile
    22772284
    2278     tempfile=$MONDOTMP/$$.strip.txt
     2285    tempfile=$MINDI_TMP/$$.strip.txt
    22792286    cp -f $1 $tempfile
    22802287    $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
     
    23072314    local tmpfile
    23082315
    2309     tmpfile=$MONDOTMP/stripped.$$.dat
     2316    tmpfile=$MINDI_TMP/stripped.$$.dat
    23102317    [ -d "$1" ] || [ -h "$1" ] && return
    23112318    cp -f $1 $tmpfile
     
    24952502    maxsize=$(($disksize-$kernelsize))
    24962503    maxsize=$(($maxsize*2)); # to allow for compression of 50%
    2497     tempfile=$MONDOTMP/temp.rd
    2498     mountpoint=$MONDOTMP/mnt1
     2504    tempfile=$MINDI_TMP/temp.rd
     2505    mountpoint=$MINDI_TMP/mnt1
    24992506    res=0
    25002507    echo -en "..."
     
    25032510    mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE
    25042511
    2505     [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.log
    2506     rm -f $MONDOTMP/mke2fs.log
     2512    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
     2513    rm -f $MINDI_TMP/mke2fs.log
    25072514    echo -en "..."
    25082515    mkdir -p $mountpoint
     
    25112518    old_pwd=`pwd`
    25122519    cd $mountpoint
    2513     cp -Rdf $tgz_dir_fname/* . 2>> $LOGFILE >> $LOGFILE
     2520    cp -Rdf $tgz_dir_fname/* . &>> $LOGFILE
    25142521    tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
    25152522    cd dev || Die "Can't cd to dev"
     
    25462553    old_pwd=`pwd`
    25472554    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    2548         cd $MONDOTMP
     2555        cd $MINDI_TMP
    25492556        floppy_modules_path=lib/modules/$FAILSAFE_KVER
    25502557    else
     
    25702577        list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
    25712578    fi
    2572     if [ -e "$MONDOTMP/NFS-DEV" ] ; then
     2579    if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    25732580        # For PXE boot
    25742581        list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
     
    25802587    for i in $floppy_modules ; do
    25812588        [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
    2582         [ "$YOUR_KERNEL_SUCKS" ] && i=$MONDOTMP/$i
     2589        [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
    25832590        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
    2584         cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
     2591        cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint\n"
    25852592        [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
    25862593    done
     
    25982605    if [ "`DidMondoCallMe`" ] ; then
    25992606        MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
    2600         cp -f $mountpoint/tmp/mondo-restore.cfg $MONDOTMP &> /dev/null
    2601         cp -f $MONDOTMP/mountlist.txt $mountpoint/tmp/ || Die "Cannot copy mountlist to ramdisk"
     2607        cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
     2608        cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ 2>/dev/null || Die "Cannot copy mountlist to ramdisk"
    26022609        echo -en "$FILES_IN_FILELIST" > $mountpoint/tmp/FILES-IN-FILELIST
    26032610        echo -en "$LAST_FILELIST_NUMBER" > $mountpoint/tmp/LAST-FILELIST-NUMBER
     
    26552662    if [ "`DidMondoCallMe`" ] ; then
    26562663        for q in filelist.full.gz biggielist.txt ; do
    2657             [ ! -e "$MONDOTMP/$q" ] && Die "Cannot find $MONDOTMP/$q"
    2658             cp -pRdf $MONDOTMP/$q tmp/
     2664            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
     2665            cp -pRdf $MINDI_TMP/$q tmp/
    26592666        done
    26602667        mkdir -p $minidir_root/all/tmp
     
    27272734fi
    27282735# BERLIOS: Remove as too dangerous and now useless
    2729 #grep -F " $MONDOTMP " /proc/mounts | grep -F tmpfs > /dev/null 2> /dev/null && MONDOTMP=/home/tmpmondo && mkdir -p $MONDOTMP && LogIt "Changing MONDOTMP to $MONDOTMP because you're using tmpfs for /tmp\n" ; # tmpfs doesn't like Mindi and /tmp, for some reason
     2736#grep -F " $MINDI_TMP " /proc/mounts | grep -F tmpfs > /dev/null 2> /dev/null && MINDI_TMP=/home/tmpmondo && mkdir -p $MINDI_TMP && LogIt "Changing MINDI_TMP to $MINDI_TMP because you're using tmpfs for /tmp\n" ; # tmpfs doesn't like Mindi and /tmp, for some reason
    27302737trap "Aborted" SIGTERM
    27312738DONE="\r\t\t\t\t\t\t\t\tDone.         "
     
    27812788        MindiExit 0
    27822789    elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
    2783         MONDOTMP=$2
     2790        MONDO_TMP=$2
     2791        # Change MINDI_TMP for the one provided by mondo
     2792        # So that it can get back the built files
     2793        rm -rf $MINDI_TMP
     2794        MINDI_TMP=$MONDO_TMP
     2795        mkdir -p $MINDI_TMP
     2796        FDISKLOG=$MINDI_TMP/parted2fdisk.log
    27842797        CACHE_LOC=$3
    27852798        if [ _"$CACHE_LOC" != _"" ]; then
     
    28432856        fi
    28442857        [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
    2845         MONDO_ROOT=`echo $CACHEDIR | sed 's/\(.*\)\/.*/\1/'`
     2858        MONDO_ROOT=`echo $CACHE_LOC | sed 's/\(.*\)\/.*/\1/'`
    28462859        if [ _"$MONDO_ROOT" != _"" ]; then
    28472860            mkdir -p $MONDO_ROOT
     
    28882901if [ "$NOT_BOOT" != "" ] && [ "$NOT_BOOT" != "0" ] && [ "$NOT_BOOT" != "no" ] ; then
    28892902    LogIt "Just creating mondo-restore.cfg and a small all.tar.gz for Mondo. Nothing else.\n"
    2890     MakeMondoConfigFile $MONDOTMP/mondo-restore.cfg
    2891     MakeMountlist $MONDOTMP/mountlist.txt
    2892     mkdir -p $MONDOTMP/small-all/tmp
    2893     cd $MONDOTMP/small-all
    2894     cp -f $MONDOTMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp || Die "Cannot copy small all.tar.gz"
    2895     tar -cv tmp | gzip -9 > $MONDOTMP/all.tar.gz || Die "Cannot make small all.tar.gz"
     2903    MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
     2904    MakeMountlist $MINDI_TMP/mountlist.txt
     2905    mkdir -p $MINDI_TMP/small-all/tmp
     2906    cd $MINDI_TMP/small-all
     2907    cp -f $MINDI_TMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp 2>/dev/null || Die "Cannot copy small all.tar.gz"
     2908    tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
    28962909    sleep 2
    28972910    LogIt "Done. Exiting.\n"
     
    29342947    LogIt "disks then it may still be a result of a problem with your kernel.\n"
    29352948    pwd=`pwd`
    2936     cd $MONDOTMP
     2949    cd $MINDI_TMP
    29372950    bzip2 -dc $MINDI_LIB/lib.tar.bz2 | tar -x || Die "Cannot unzip lib.tar.bz2"
    29382951    cd $pwd
    29392952    YOUR_KERNEL_SUCKS="Your kernel sucks"
    29402953fi
    2941 echo -e "Mindi's temp dir = $MONDOTMP \nMindi's output dir=$CACHE_LOC" >> $LOGFILE
     2954echo -e "Mindi's temp dir = $MINDI_TMP \nMindi's output dir=$CACHE_LOC" >> $LOGFILE
    29422955[ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty...\n"
    29432956
    29442957[ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it. Go to http://www.mondorescue.org and download it, then install it."
    29452958
    2946 rm -f $CACHEDIR/{*img,*gz,*iso}
    2947 
    2948 PrepareDataDiskImages $CACHEDIR
     2959rm -f $CACHE_LOC/{*img,*gz,*iso}
     2960
     2961PrepareDataDiskImages $CACHE_LOC
    29492962noof_disks=$?
    29502963[ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
     
    29522965mkdir -p $minidir_root/$noof_disks/tmp
    29532966cp -f $TMP_ROOT/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt || Die "Cannot copy mountlist.txt from $TMP_ROOT to data disk"
    2954 cp -f $TMP_ROOT/mountlist.txt $CACHEDIR
     2967cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
    29552968[ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
    29562969[ -d "/proc/lvm" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     
    29582971cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
    29592972ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
    2960 CreateDataDiskImagesFromTarballs $tardir $CACHEDIR $noof_disks
     2973CreateDataDiskImagesFromTarballs $tardir $CACHE_LOC $noof_disks
    29612974FRIENDLY_OUTSTRING="Boot and data disk images were created."
    29622975# One 1.72MB boot disk, one 2.88MB boot disk and $noof_disks data disk images
     
    30083021    [ ! -e "$boot_dev" ] && Die "Will you PLEASE tell your distribution maker to create the 1.72MB devices in /dev?"
    30093022    if [ "$PROMPT_WRITE_BOOT_FLOPPIES" = "yes" ]; then
    3010         OfferToCopyImagesToDisks $CACHEDIR $boot_dev $FDDEVICE
     3023        OfferToCopyImagesToDisks $CACHE_LOC $boot_dev $FDDEVICE
    30113024    fi
    30123025    OfferToMakeBootableISO $CACHE_LOC
    30133026    LogIt "Finished.\n"
    30143027elif [ "$TAPEDEV" ] ; then
    3015     rm -f $CACHEDIR/{*img,*gz,*iso}
     3028    rm -f $CACHE_LOC/{*img,*gz,*iso}
    30163029    OfferToMakeBootableISO $CACHE_LOC
    30173030    if [ -e "$CACHE_LOC/all.tar.gz" ] ; then
    3018         cp -f $CACHE_LOC/all.tar.gz $MONDOTMP/
     3031        cp -f $CACHE_LOC/all.tar.gz $MINDI_TMP/
    30193032    else
    30203033        Die "Cannot find all.tar.gz, to be written to tape"
     
    30243037fi
    30253038# cleanup
    3026 rm -Rf $MONDOTMP $FDISKLOG
    30273039LogIt "$FRIENDLY_OUTSTRING\n"
    30283040for mtpt in $FLOPPY_WAS_MOUNTED ; do
Note: See TracChangeset for help on using the changeset viewer.