Changeset 956 in MondoRescue for trunk/mindi/mindi

Timestamp:

Nov 21, 2006, 1:42:46 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r938:954 $SVN_M/branches/stable

File:

• trunk/mindi/mindi (modified) (57 diffs)

trunk/mindi/mindi

@@ -61 +61 @@
 WRITE_MINDI_CD="$mindi_write_cd"
 # TBC
-CACHEDIR="$mindi_images_dir"
+CACHE_LOC="$mindi_images_dir"
 FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
 TMP_ROOT="$mindi_tmp_dir"
@@ -102 +102 @@
 BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
 FDISK=$MINDI_SBIN/parted2fdisk
-FDISKLOG=$MONDOTMP/parted2fdisk.log
-touch $FDISKLOG
 
 # Using a config file allow to overwrite some values
@@ -112 +110 @@
 
 # Now we can create what we nedd
-MONDOTMP=`mktemp -d $TMPDIR/mondobuild.XXXXXXXXXX`
-mkdir -p $MONDOTMP
+MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
+mkdir -p $MINDI_TMP
+
+FDISKLOG=$MINDI_TMP/parted2fdisk.log
+
+# Purge from potential old run
+rm -rf $CACHE_LOC/* 2> /dev/null
 mkdir -p $CACHE_LOC
 # ----------------------------------------------------------------------------
@@ -278 +281 @@
 
     sliceno=0
-    scratchfile=$MONDOTMP/blah.$$.dat
+    scratchfile=$MINDI_TMP/blah.$$.dat
     cp -f $filename $scratchfile || Die "CUACF -- cannot copy $filename to $scratchfile - did you run out of disk space?"
     [ "`head $scratchfile -n1 | grep -F "bin/sh"`" != "" ] && StripComments $scratchfile "-$filename-"
@@ -341 +344 @@
                 BIGNO=$(($BIGNO+1))
             else
-                cp --parents -Rdf $incoming $outdir || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
+                cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
                 if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
                     gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming\n"
@@ -430 +433 @@
     noof_disks=$4
 
-    mountpoint=$MONDOTMP/mountpoint.$$
+    mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)\n"
-    mke2fs -N 12 -F $imagefile > $MONDOTMP/mke2fs.$$ 2>> $MONDOTMP/mke2fs.$$
-    [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.$$
-    rm -f $MONDOTMP/mke2fs.$$
+    mke2fs -N 12 -F $imagefile > $MINDI_TMP/mke2fs.$$ 2>> $MINDI_TMP/mke2fs.$$
+    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.$$
+    rm -f $MINDI_TMP/mke2fs.$$
     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."
     mv $tarball $mountpoint/
@@ -471 +474 @@
     my_partitions=`mount | grep -F $$ | cut -f1 -d' '`
     [ "$my_partitions" != "" ] && umount $my_partitions
-    # Clean temporary files
-    rm -Rf $MONDOTMP $FDISKLOG
+    # Clean temporary files only when standalone mindi
+    if [ _"$MINDI_TMP" != _"$MONDO_TMP" ]; then
+        rm -Rf $MINDI_TMP
+    fi
     exit $1
 }
@@ -485 +490 @@
 
     # Creates a tar file containing all required files
-    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log $FDISKLOG ; do
-        [ -e "$i" ] && cp -f $i $MONDOTMP
+    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
+        [ -e "$i" ] && cp -f $i $MINDI_TMP
     done
     rm -f $TMPDIR/mindi.err.*.tgz
-    tar -cf - $MONDOTMP | gzip -9 > $TMPDIR/mindi.err.$$.tgz
+    tar -cf - $MINDI_TMP | gzip -9 > $TMPDIR/mindi.err.$$.tgz
     LogIt "Please e-mail a copy of $TMPDIR/mindi.err.$$.tgz to the mailing list.\n"
     LogIt "See http://www.mondorescue.org for more information.\n"
@@ -683 +688 @@
     pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-        cd $MONDOTMP
+        cd $MINDI_TMP
     else
         cd /
@@ -706 +711 @@
     echo -en "Analyzing dependency requirements"
     outfile=$1
-    tempfile=$MONDOTMP/$$.txt
+    tempfile=$MINDI_TMP/$$.txt
     incoming=`ReadLine`
 
@@ -829 +834 @@
         mkdir -p $bigdir/sbin
         mkdir -p $bigdir/bin
-        if [ -e "$MONDOTMP/post-nuke.tgz" ] ; then
+        if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
             LogIt "\nIncorporating post-nuke tarball\n"
             old_pwd=`pwd`
             cd $bigdir
-            tar -zxf $MONDOTMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball\n"
+            tar -zxf $MINDI_TMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball\n"
             cd $old_pwd
         fi
-        if cp -f $MONDOTMP/mondo*restore $bigdir/usr/bin ; then
+        if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin ; then
             LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
         else
-            LogIt "Cannot find mondo*restore in mondo's tempdir, $MONDOTMP\n"
+            LogIt "Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP\n"
             LogIt "I bet you've got a spare copy of Mondo or Mindi floating around on your system.\n"
             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."
             Die "Odd."
         fi
-        cp -f $MONDOTMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
-        if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
+        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
             LogIt "Incorporating NFS-related settings\n"
             for r in NFS-* ISO-PREFIX ; do
-                cp -f $MONDOTMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
+                cp -f $MINDI_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
                 echo "Copying $r to ramdisk" >> $LOGFILE
             done
@@ -915 +920 @@
     incoming=`ReadLine`
     pwd=`pwd`
-    cd $MONDOTMP
+    cd $MINDI_TMP
     while [ "$incoming" != "" ] ; do
         stub=`basename $incoming`
@@ -1082 +1087 @@
     echo "datestamp `date`" >> $outfile
     [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
-    AddFileToCfgIfExists $MONDOTMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
-    AddFileToCfgIfExists $MONDOTMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
-    AddFileToCfgIfExists $MONDOTMP/NFS-CLIENT-BROADCAST nfs-client-broadcast $outfile
-    AddFileToCfgIfExists $MONDOTMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
-    AddFileToCfgIfExists $MONDOTMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
-    AddFileToCfgIfExists $MONDOTMP/NFS-SERVER-PATH   nfs-server-path   $outfile
-    AddFileToCfgIfExists $MONDOTMP/NFS-DEV           nfs-dev           $outfile
-    AddFileToCfgIfExists $MONDOTMP/NFS-SERVER-IPADDR nfs-server-ipaddr $outfile
-    AddFileToCfgIfExists $MONDOTMP/ISO-DEV           iso-dev           $outfile
-    AddFileToCfgIfExists $MONDOTMP/ISO-MNT           iso-mnt           $outfile
-    AddFileToCfgIfExists $MONDOTMP/ISO-PREFIX        iso-prefix        $outfile
-    AddFileToCfgIfExists $MONDOTMP/ISODIR            isodir            $outfile
-    AddFileToCfgIfExists $MONDOTMP/BOOTLOADER.DEVICE bootloader.device $outfile
-    AddFileToCfgIfExists $MONDOTMP/BOOTLOADER.NAME   bootloader.name   $outfile
-    AddFileToCfgIfExists $MONDOTMP/KEYMAP-LIVES-HERE keymap-lives-here $outfile
-    AddFileToCfgIfExists $MONDOTMP/TAPEDEV-HAS-DATA-DISKS tapedev-has-data-disks $outfile
-    AddFileToCfgIfExists $MONDOTMP/BACKUP-MEDIA-TYPE backup-media-type $outfile
-    AddFileToCfgIfExists $MONDOTMP/DIFFERENTIAL      differential      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-BROADCAST nfs-client-broadcast $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-PATH   nfs-server-path   $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NFS-DEV           nfs-dev           $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-IPADDR nfs-server-ipaddr $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ISO-DEV           iso-dev           $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ISO-MNT           iso-mnt           $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ISO-PREFIX        iso-prefix        $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ISODIR            isodir            $outfile
+    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
+    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.NAME   bootloader.name   $outfile
+    AddFileToCfgIfExists $MINDI_TMP/KEYMAP-LIVES-HERE keymap-lives-here $outfile
+    AddFileToCfgIfExists $MINDI_TMP/TAPEDEV-HAS-DATA-DISKS tapedev-has-data-disks $outfile
+    AddFileToCfgIfExists $MINDI_TMP/BACKUP-MEDIA-TYPE backup-media-type $outfile
+    AddFileToCfgIfExists $MINDI_TMP/DIFFERENTIAL      differential      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ACL      acl      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/XATTR      xattr      $outfile
 }
 
@@ -1112 +1119 @@
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
         kver=$FAILSAFE_KVER
-        cd $MONDOTMP
+        cd $MINDI_TMP
         searchpath=lib/modules/$kver
     else
@@ -1136 +1143 @@
     # Make temporary modprobe.conf file if we are told so
     if [ $tmpmodprobe_flag == "Y" ] ; then
-        infile="$MONDOTMP/modprobe.conf.mindi"
+        infile="$MINDI_TMP/modprobe.conf.mindi"
         find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
     else
@@ -1177 +1184 @@
 
 # scratchdir, mountlist(OUT)
-    scratchdir=$MONDOTMP
+    scratchdir=$MINDI_TMP
     mountlist=$1
 
@@ -1451 +1458 @@
     rm -f $1.tmp
     if [ "$CDRECOVERY" != "yes" ] ; then
-        if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
             echo -en "Press <enter> to continue.\n" >> $1
-        elif [ ! "$MONDOTMP" ] ; then
+        elif [ ! "$MINDI_TMP" ] ; then
             echo -en "FYI, this is _not_ a Mondo Rescue CD.\n" >> $1
             if [ -e "$MINDI_LIB/memtest.img" ] ; then
@@ -1533 +1540 @@
         [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
     fi
-    if [ ! "$MONDOTMP" ] ; then
+    if [ ! "$MINDI_TMP" ] ; then
         LogIt "NB: Mindi's bootable CD always uses isolinux.\n"
         LogIt "For a bootable CD w/LILO, please use Mondo.\n"
     fi
-    rm -Rf $MONDOTMP/iso
-    mkdir -p $MONDOTMP/iso/{images,archives,isolinux}
-    cp -f $1/*.img $1/*.gz $MONDOTMP/iso/images || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MONDOTMP/iso/images\n"
+    rm -Rf $MINDI_TMP/iso
+    mkdir -p $MINDI_TMP/iso/{images,archives,isolinux}
+    cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images\n"
     old_pwd=`pwd`
-    cd $MONDOTMP/iso
+    cd $MINDI_TMP/iso
     mkdir -p $MONDO_ROOT/iso/isolinux
     echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
-    cp $MINDI_LIB/mem{test,disk}* $MONDO_ROOT 2>> $LOGFILE
     for i in memdisk memtest.bin memtest.img ; do
-    j=$MINDI_LIB/$i
-    k=$MONDOTMP/iso/isolinux
-    if [ -e "$j" ] ; then
-        LogIt "Copying $j to $k\n"
-        cp -f $j $k || Die "Failed to copy $j to $k"
-        cp -f $j $MONDOTMP || Die "Failed to copy $j to $k"
-    fi
-    done
-    MakeSyslinuxMessageFile $MONDOTMP/iso/isolinux/message.txt
-    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?"
-    cp $MONDOTMP/mindi.rdz $MONDOTMP/iso/isolinux/initrd.img
-    cp $MONDOTMP/mindi.rdz $CACHE_LOC/initrd.img
+        j=$MINDI_LIB/$i
+        k=$MINDI_TMP/iso/isolinux
+        if [ -e "$j" ] ; then
+            LogIt "Copying $j to $k\n"
+            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
+            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
+            cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
+        fi
+    done
+    MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
+    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?"
+    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img
+    cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
-    cd $MONDOTMP/iso/isolinux
-    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?"
-    if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+    cd $MINDI_TMP/iso/isolinux
+    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?"
+    if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
         mv isolinux.cfg isolinux.cfg.old
         sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
     fi
     if [ "$ARCH" != "ia64" ] ; then
-        cp $ISOLINUX isolinux.bin || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
+        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
         cp $ISOLINUX ../
     fi
-    cd $MONDOTMP/iso
+    cd $MINDI_TMP/iso
     if [ "$ARCH" != "ia64" ] ; then
-        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?"
+        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?"
     fi
     [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
     if [ "$ARCH" != "ia64" ] ; then
-        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
-    else
-        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
+        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
+    else
+        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
     fi
     if [ "$?" -ne "0" ] ; then
         echo "----------- mkisofs's errors --------------" >> $LOGFILE
-        cat $MONDOTMP/mkisofs.log >> $LOGFILE
+        cat $MINDI_TMP/mkisofs.log >> $LOGFILE
         echo "mkisofs returned the following errors:-"
-        cat $MONDOTMP/mkisofs.log
+        cat $MINDI_TMP/mkisofs.log
         LogIt "Failed to create ISO image.\n"
     else
-        echo "Created bootable ISO image at $CACHEDIR/mindi.iso" >> $LOGFILE
-    fi
-    rm -f $MONDOTMP/mkisofs.log
+        echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" >> $LOGFILE
+    fi
+    rm -f $MINDI_TMP/mkisofs.log
     cd $old_pwd
 }
@@ -1609 +1616 @@
         if [ "`DidMondoCallMe`" ] ; then
             if [ "$CDRECOVERY" != "yes" ] ; then
-                if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+                if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
                     echo -en "Press <enter> to continue.\n"
-                elif [ ! "$MONDOTMP" ] ; then
+                elif [ ! "$MINDI_TMP" ] ; then
                     echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
                 else
@@ -1637 +1644 @@
     rand1=$RANDOM
     rand2=$RANDOM
-    image=$MONDOTMP/$rand1.$rand2.img
-    mtpt=$MONDOTMP/$rand1.$rand2.mtpt
+    image=$MINDI_TMP/$rand1.$rand2.img
+    mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
     dd if=/dev/zero of=$image bs=1k count=$disksize
     mke2fs -N 26 -F $image > /dev/null
@@ -1703 +1710 @@
         echo -en "default=RESTORE\n"
     elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
-        if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
             echo -en "default=iso\n"
         else
@@ -1724 +1731 @@
     elif [ "$disksize" -gt "2880" ] ; then
         if [ "`DidMondoCallMe`" ] ; then
-            if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+            if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
                 options="iso"
             else
@@ -1767 +1774 @@
     [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
     echo -en "Making "$disksize"KB boot disk..."
-    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?"
+    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?"
     if [ "$ARCH" != "ia64" ] ; then
         [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
@@ -1773 +1780 @@
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$disksize.img
-    mountpoint=$MONDOTMP/mountpoint.$$
+    mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
     if [ "$ARCH" = "ia64" ] ; then
-        mkdosfs $imagefile > $MONDOTMP/mke2fs.log 2>> $MONDOTMP/mke2fs.log
+        mkdosfs $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
     t=vfat
     else
-        mke2fs -N 26 -m 0 -F $imagefile > $MONDOTMP/mke2fs.log 2>> $MONDOTMP/mke2fs.log
+        mke2fs -N 26 -m 0 -F $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
     t=ext2
     fi
-    [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.log
-    rm -f $MONDOTMP/mke2fs.log
+    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
+    rm -f $MINDI_TMP/mke2fs.log
     mount -t $t -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
 # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
@@ -1805 +1812 @@
     MakeLiloConfFile $disksize > $liloconf
 
-    echo "Copying $MONDOTMP/mindi.rdz to $mountpoint..." >> $LOGFILE
-    cp -f $MONDOTMP/mindi.rdz $mountpoint 2>> $LOGFILE
+    echo "Copying $MINDI_TMP/mindi.rdz to $mountpoint..." >> $LOGFILE
+    cp -f $MINDI_TMP/mindi.rdz $mountpoint 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $MONDOTMP/mindi.rdz to $mountpoint\n"
-        cat $MONDOTMP/mtpt.$$ >> $LOGFILE
+        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint\n"
+        cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
         LogIt "Please unload some of your modules and try again.\n"
-        rm -f $MONDOTMP/mtpt.$$
+        rm -f $MINDI_TMP/mtpt.$$
         LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
         retval=$(($retval+1))
@@ -1818 +1825 @@
 
     mkdir -p $mountpoint/tmp
-    cp -f $MONDOTMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
+    cp -f $MINDI_TMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
     if [ -e "$MINDI_LIB/memtest.img" ] ; then
         echo -en "image=/memtest.bin\nlabel=memtest\nn" >> $liloconf
@@ -1844 +1851 @@
         write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
         res=$(($res+$?))
-        cp -f $MONDOTMP/mindi.rdz $imagesdir/mindi-root.1440.img
+        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img
         res=$(($res+$?))
         rm -f $imagefile
@@ -1885 +1892 @@
         retval=$(($retval+1))
     fi
-    cp -f $liloconf $MONDOTMP/lilo.conf
+    cp -f $liloconf $MINDI_TMP/lilo.conf
     if [ "$ARCH" = "ia64" ] ; then
         cp `dirname $kernelpath`/*.efi $mountpoint
@@ -1919 +1926 @@
     [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
     echo -en "Making "$disksize"KB boot disk..."
-    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?"
+    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?"
     [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$disksize.img
-    mountpoint=$MONDOTMP/mountpoint.$$
+    mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
 # If I format a 1722KB data file & run syslinux on it, the resultant image
@@ -1946 +1953 @@
     [ -e "$sys_cfg_file" ] || Die "Obi Wan, word up?"
     cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
-    if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+    if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
         mv syslinux.cfg syslinux.cfg.orig
         sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
     fi
     cd $old_pwd
-    echo "Copying $MONDOTMP/mindi.rdz to $mountpoint/initrd.img..." >> $LOGFILE
-    cp -f $MONDOTMP/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
+    echo "Copying $MINDI_TMP/mindi.rdz to $mountpoint/initrd.img..." >> $LOGFILE
+    cp -f $MINDI_TMP/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $MONDOTMP/mindi.rdz to $mountpoint\n"
-        cat $MONDOTMP/mtpt.$$ >> $LOGFILE
+        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint\n"
+        cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
         LogIt "Please unload some of your modules and try again.\n"
-        rm -f $MONDOTMP/mtpt.$$
+        rm -f $MINDI_TMP/mtpt.$$
         LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
         retval=$(($retval+1))
@@ -1963 +1970 @@
 
     mkdir -p $mountpoint/tmp
-    cp -f $MONDOTMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
+    cp -f $MINDI_TMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
 
     # copy the kernel across
@@ -1984 +1991 @@
         write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
         res=$(($res+$?))
-        cp -f $MONDOTMP/mindi.rdz $imagesdir/mindi-root.1440.img
+        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img
         res=$(($res+$?))
         rm -f $imagefile
@@ -2027 +2034 @@
     imagesdir=$1
     rm -f $imagesdir/mindi-*.img $imagesdir/[0-9]*.tar.gz $imagesdir/mindi.iso
-    needlist=$MONDOTMP/what-we-need.txt
-    bigdir=$MONDOTMP/bigdir
-    minidir_root=$MONDOTMP/minidir
+    needlist=$MINDI_TMP/what-we-need.txt
+    bigdir=$MINDI_TMP/bigdir
+    minidir_root=$MINDI_TMP/minidir
     mkdir -p $minidir_root
     mkdir -p $bigdir/usr/bin
-    tardir=$MONDOTMP/tardir
+    tardir=$MINDI_TMP/tardir
 
     lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
@@ -2039 +2046 @@
     if [ "$YOUR_KERNEL_SUCKS" ]; then
         pwd=`pwd`
-        cd $MONDOTMP
+        cd $MINDI_TMP
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
             cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
@@ -2072 +2079 @@
     mkdir -p $bigdir/tmp
     if [ "`DidMondoCallMe`" ] ; then
-        MakeMondoConfigFile $MONDOTMP/mondo-restore.cfg
-        cp -f $MONDOTMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
+        MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
+        cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
     fi
     [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
@@ -2088 +2095 @@
 
     # master boot record, too
-    i=`cat $MONDOTMP/BOOTLOADER.DEVICE 2> /dev/null`
+    i=`cat $MINDI_TMP/BOOTLOADER.DEVICE 2> /dev/null`
     if [ "$i" ] ; then
         LogIt "Backing up $i's MBR\n"
@@ -2098 +2105 @@
         LogIt "Creating /dev/boot_device ($j)\n"
         mkdir -p $bigdir/dev
-        cp -pRdf $j $bigdir/dev/boot_device || Die "Unable to create /dev/boot_device on ramdisk"
+        cp -pRdf $j $bigdir/dev/boot_device 2> /dev/null || Die "Unable to create /dev/boot_device on ramdisk"
     fi
 
@@ -2125 +2132 @@
 #        EXTRA_SPACE=$(($EXTRA_SPACE*2))
 #    fi
-    MakeMountlist $MONDOTMP/mountlist.txt
+    MakeMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $minidir_root/$noof_disks/tmp
-    cp -f $MONDOTMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt || Die "Cannot copy mountlist.txt from $MONDOTMP to data disk"
-    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDOTMP/.
+    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"
+    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/.
     [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
@@ -2276 +2283 @@
     local tempfile
 
-    tempfile=$MONDOTMP/$$.strip.txt
+    tempfile=$MINDI_TMP/$$.strip.txt
     cp -f $1 $tempfile
     $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
@@ -2307 +2314 @@
     local tmpfile
 
-    tmpfile=$MONDOTMP/stripped.$$.dat
+    tmpfile=$MINDI_TMP/stripped.$$.dat
     [ -d "$1" ] || [ -h "$1" ] && return
     cp -f $1 $tmpfile
@@ -2495 +2502 @@
     maxsize=$(($disksize-$kernelsize))
     maxsize=$(($maxsize*2)); # to allow for compression of 50%
-    tempfile=$MONDOTMP/temp.rd
-    mountpoint=$MONDOTMP/mnt1
+    tempfile=$MINDI_TMP/temp.rd
+    mountpoint=$MINDI_TMP/mnt1
     res=0
     echo -en "..."
@@ -2503 +2510 @@
     mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE
 
-    [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.log
-    rm -f $MONDOTMP/mke2fs.log
+    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
+    rm -f $MINDI_TMP/mke2fs.log
     echo -en "..."
     mkdir -p $mountpoint
@@ -2511 +2518 @@
     old_pwd=`pwd`
     cd $mountpoint
-    cp -Rdf $tgz_dir_fname/* . 2>> $LOGFILE >> $LOGFILE
+    cp -Rdf $tgz_dir_fname/* . &>> $LOGFILE
     tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
     cd dev || Die "Can't cd to dev"
@@ -2546 +2553 @@
     old_pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-        cd $MONDOTMP
+        cd $MINDI_TMP
         floppy_modules_path=lib/modules/$FAILSAFE_KVER
     else
@@ -2570 +2577 @@
         list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     fi
-    if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+    if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
         # For PXE boot
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
@@ -2580 +2587 @@
     for i in $floppy_modules ; do
         [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
-        [ "$YOUR_KERNEL_SUCKS" ] && i=$MONDOTMP/$i
+        [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
+        cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint\n"
         [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     done
@@ -2598 +2605 @@
     if [ "`DidMondoCallMe`" ] ; then
         MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
-        cp -f $mountpoint/tmp/mondo-restore.cfg $MONDOTMP &> /dev/null
-        cp -f $MONDOTMP/mountlist.txt $mountpoint/tmp/ || Die "Cannot copy mountlist to ramdisk"
+        cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
+        cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ 2>/dev/null || Die "Cannot copy mountlist to ramdisk"
         echo -en "$FILES_IN_FILELIST" > $mountpoint/tmp/FILES-IN-FILELIST
         echo -en "$LAST_FILELIST_NUMBER" > $mountpoint/tmp/LAST-FILELIST-NUMBER
@@ -2655 +2662 @@
     if [ "`DidMondoCallMe`" ] ; then
         for q in filelist.full.gz biggielist.txt ; do
-            [ ! -e "$MONDOTMP/$q" ] && Die "Cannot find $MONDOTMP/$q"
-            cp -pRdf $MONDOTMP/$q tmp/
+            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
+            cp -pRdf $MINDI_TMP/$q tmp/
         done
         mkdir -p $minidir_root/all/tmp
@@ -2727 +2734 @@
 fi
 # BERLIOS: Remove as too dangerous and now useless
-#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
+#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
 trap "Aborted" SIGTERM
 DONE="\r\t\t\t\t\t\t\t\tDone.         "
@@ -2781 +2788 @@
         MindiExit 0
     elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
-        MONDOTMP=$2
+        MONDO_TMP=$2
+        # Change MINDI_TMP for the one provided by mondo 
+        # So that it can get back the built files
+        rm -rf $MINDI_TMP
+        MINDI_TMP=$MONDO_TMP
+        mkdir -p $MINDI_TMP
+        FDISKLOG=$MINDI_TMP/parted2fdisk.log
         CACHE_LOC=$3
         if [ _"$CACHE_LOC" != _"" ]; then
@@ -2843 +2856 @@
         fi
         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
-        MONDO_ROOT=`echo $CACHEDIR | sed 's/\(.*\)\/.*/\1/'`
+        MONDO_ROOT=`echo $CACHE_LOC | sed 's/\(.*\)\/.*/\1/'`
         if [ _"$MONDO_ROOT" != _"" ]; then
             mkdir -p $MONDO_ROOT
@@ -2888 +2901 @@
 if [ "$NOT_BOOT" != "" ] && [ "$NOT_BOOT" != "0" ] && [ "$NOT_BOOT" != "no" ] ; then
     LogIt "Just creating mondo-restore.cfg and a small all.tar.gz for Mondo. Nothing else.\n"
-    MakeMondoConfigFile $MONDOTMP/mondo-restore.cfg
-    MakeMountlist $MONDOTMP/mountlist.txt
-    mkdir -p $MONDOTMP/small-all/tmp
-    cd $MONDOTMP/small-all
-    cp -f $MONDOTMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp || Die "Cannot copy small all.tar.gz"
-    tar -cv tmp | gzip -9 > $MONDOTMP/all.tar.gz || Die "Cannot make small all.tar.gz"
+    MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
+    MakeMountlist $MINDI_TMP/mountlist.txt
+    mkdir -p $MINDI_TMP/small-all/tmp
+    cd $MINDI_TMP/small-all
+    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"
+    tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
     sleep 2
     LogIt "Done. Exiting.\n"
@@ -2934 +2947 @@
     LogIt "disks then it may still be a result of a problem with your kernel.\n"
     pwd=`pwd`
-    cd $MONDOTMP
+    cd $MINDI_TMP
     bzip2 -dc $MINDI_LIB/lib.tar.bz2 | tar -x || Die "Cannot unzip lib.tar.bz2"
     cd $pwd
     YOUR_KERNEL_SUCKS="Your kernel sucks"
 fi
-echo -e "Mindi's temp dir = $MONDOTMP \nMindi's output dir=$CACHE_LOC" >> $LOGFILE
+echo -e "Mindi's temp dir = $MINDI_TMP \nMindi's output dir=$CACHE_LOC" >> $LOGFILE
 [ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty...\n"
 
 [ "$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."
 
-rm -f $CACHEDIR/{*img,*gz,*iso}
-
-PrepareDataDiskImages $CACHEDIR
+rm -f $CACHE_LOC/{*img,*gz,*iso}
+
+PrepareDataDiskImages $CACHE_LOC
 noof_disks=$?
 [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
@@ -2952 +2965 @@
 mkdir -p $minidir_root/$noof_disks/tmp
 cp -f $TMP_ROOT/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt || Die "Cannot copy mountlist.txt from $TMP_ROOT to data disk"
-cp -f $TMP_ROOT/mountlist.txt $CACHEDIR
+cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
 [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
 [ -d "/proc/lvm" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
@@ -2958 +2971 @@
 cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
 ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
-CreateDataDiskImagesFromTarballs $tardir $CACHEDIR $noof_disks
+CreateDataDiskImagesFromTarballs $tardir $CACHE_LOC $noof_disks
 FRIENDLY_OUTSTRING="Boot and data disk images were created."
 # One 1.72MB boot disk, one 2.88MB boot disk and $noof_disks data disk images
@@ -3008 +3021 @@
     [ ! -e "$boot_dev" ] && Die "Will you PLEASE tell your distribution maker to create the 1.72MB devices in /dev?"
     if [ "$PROMPT_WRITE_BOOT_FLOPPIES" = "yes" ]; then
-        OfferToCopyImagesToDisks $CACHEDIR $boot_dev $FDDEVICE
+        OfferToCopyImagesToDisks $CACHE_LOC $boot_dev $FDDEVICE
     fi
     OfferToMakeBootableISO $CACHE_LOC
     LogIt "Finished.\n"
 elif [ "$TAPEDEV" ] ; then
-    rm -f $CACHEDIR/{*img,*gz,*iso}
+    rm -f $CACHE_LOC/{*img,*gz,*iso}
     OfferToMakeBootableISO $CACHE_LOC
     if [ -e "$CACHE_LOC/all.tar.gz" ] ; then
-        cp -f $CACHE_LOC/all.tar.gz $MONDOTMP/
+        cp -f $CACHE_LOC/all.tar.gz $MINDI_TMP/
     else
         Die "Cannot find all.tar.gz, to be written to tape"
@@ -3024 +3037 @@
 fi
 # cleanup
-rm -Rf $MONDOTMP $FDISKLOG
 LogIt "$FRIENDLY_OUTSTRING\n"
 for mtpt in $FLOPPY_WAS_MOUNTED ; do