Changeset 932 in MondoRescue for trunk/mindi/mindi

Timestamp:

Nov 15, 2006, 12:40:15 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r913:931 $SVN_M/branches/stable

File:

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

trunk/mindi/mindi

@@ -14 +14 @@
 
 ### Which arch are we on (useful for ia64 port)
-export ARCH=`/bin/arch`
-
-RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
+ARCH=`/bin/arch`
+
+#RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
     # after booting from floppy/CD image but before
     # accessing auxiliary data disks (or the rest of
@@ -106 +106 @@
 
 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
+MINDI_CONFIG="$MINDI_CONF/mindi.conf"
+if [ -f $MINDI_CONFIG ]; then
+    . $MINDI_CONFIG
+fi
+
+# Now we can create what we nedd
+MONDOTMP=`mktemp -d $TMPDIR/mondobuild.XXXXXXXXXX`
+mkdir -p $MONDOTMP
+mkdir -p $CACHE_LOC
 # ----------------------------------------------------------------------------
 
@@ -114 +127 @@
     Die "Program is terminating in response to signal received from OS/user"
 }
-
 
 
@@ -129 +141 @@
     done
     if [ -e "$MINDI_LIB/memtest.img" ] ; then
-#        echo -en "label memtest\n  kernel memtest.bin\n\n"
         echo -en "label memtest\n  kernel memdisk\n  append initrd=memtest.img\n\n"
-#        echo "Yep, this is a multi-function CD" > $2/MULTIFUNC
-    fi
-}
-
+    fi
+}
 
 
@@ -143 +152 @@
     which gawk > /dev/null 2> /dev/null && AWK=`which gawk 2>/dev/null` || AWK="`which awk 2>/dev/null`"
     if which awk &> /dev/null ; then
-    if ! which gawk &> /dev/null ; then
-        LogIt "You have awk but not gawk.\nPlease note that mindi works fine with a _sane_ awk binary.\nIf your awk binary misbehaves then please contact your vendor\nor distribution's mailing list for technical support.\n"
-    fi
+        if ! which gawk &> /dev/null ; then
+            LogIt "You have awk but not gawk.\nPlease note that mindi works fine with a _sane_ awk binary.\nIf your awk binary misbehaves then please contact your vendor\nor distribution's mailing list for technical support.\n"
+        fi
     fi
     which mke2fs > /dev/null 2> /dev/null || Die "Please put mke2fs in system path"
-    which afio > /dev/null 2> /dev/null || LogIt "afio not found... mindi doesn't need afio but Mondo does... Be aware...\n"
-    [ ! -e "/etc/issue.net" ] && > /etc/issue.net
-    FDISK=$MINDI_SBIN/parted2fdisk
-    FDISKLOG=/tmp/parted2fdisk.log
-    touch $FDISKLOG
     [ ! -e "$FDISK" ] && Die "Cannot find (s)fdisk"
 }
-
 
 
@@ -167 +170 @@
 
 
-
-
-
 Aborted() {
     trap SIGHUP SIGTERM SIGTRAP SIGINT
-    rm -f $CACHEDIR/mindi*img $CACHEDIR/*gz $CACHEDIR/mindi.iso
+    [ "$CACHE_LOC" != "" ] && rm -f $CACHE_LOC/mindi*img $CACHE_LOC/*gz $CACHE_LOC/mindi.iso
     [ "$minidir_root" != "" ] && rm -Rf $minidir_root/*
     Die "User abort."
@@ -181 +181 @@
     [ -e "$1" ] && echo -en "$2 `cat $1`\n" >> $3
 }
-
 
 
@@ -190 +189 @@
     noof_disks=$3
 
-#    diskno=1
     diskno=$noof_disks
     mkdir -p $minidir_root/$diskno
     [ "$LAST_COMPRESSED_SIZE" = "" ] && LAST_COMPRESSED_SIZE=0
     if [ ! -e "$filename" ] ; then
-    if [ -h "$filename" ] ; then
-        cp --parents -pRdf $filename $minidir_root/$diskno
-        return $noof_disks
-    else
-        Die "AddFileToDir asked me to add $filename, which does not exist. Oops! Did you run out of disk space or is your Linux distro severely broken?"
-    fi
-    fi
-# move to the disk that has room on it (or end up using the last, if all full)
+        if [ -h "$filename" ] ; then
+            cp --parents -pRdf $filename $minidir_root/$diskno
+            return $noof_disks
+        else
+            Die "AddFileToDir asked me to add $filename, which does not exist. Oops! Did you run out of disk space or is your Linux distro severely broken?"
+        fi
+    fi
+
+    # move to the disk that has room on it (or end up using the last, if all full)
     while [ "$diskno" -lt "40" ] ; do
-    mkdir -p $minidir_root/$diskno
+        mkdir -p $minidir_root/$diskno
         filesize=`du -sk $filename | cut -f1`
-    cp --parents -Rdf $filename $minidir_root/$diskno
+        cp --parents -Rdf $filename $minidir_root/$diskno
         if [ "$filesize" -le "4" ] ; then
             siz=$filesize
@@ -216 +215 @@
             siz=$(($siz-2));# to allow for sectors & the fact that they round up
         fi
-    [ ! "$siz" ] && siz=4
-    [ "$siz" -lt "0" ] && siz=0
+        [ ! "$siz" ] && siz=4
+        [ "$siz" -lt "0" ] && siz=0
         LAST_COMPRESSED_SIZE=$(($LAST_COMPRESSED_SIZE+$siz))
-    [ "$LAST_COMPRESSED_SIZE" -le "$MAX_COMPRESSED_SIZE" ] &&return $diskno
-    echo "disk=$diskno siz=$LAST_COMPRESSED_SIZE" >> $LOGFILE
-    LAST_COMPRESSED_SIZE=0
-    rm -f $minidir_root/$diskno/$filename
+        [ "$LAST_COMPRESSED_SIZE" -le "$MAX_COMPRESSED_SIZE" ] &&return $diskno
+        echo "disk=$diskno siz=$LAST_COMPRESSED_SIZE" >> $LOGFILE
+        LAST_COMPRESSED_SIZE=0
+        rm -f $minidir_root/$diskno/$filename
         diskno=$(($diskno+1))
     done
     return 0 ; # failed
 }
-
-
 
 
@@ -262 +259 @@
     fi
     for included_item in $included_list ; do
-    if [ ! -e "$included_item" ] ; then
+        if [ ! -e "$included_item" ] ; then
             sss=`find $KEYDIR/keymaps | grep -F "${included_item}.inc"`
-        [ "$sss" = "" ] && sss=`find $KEYDIR/keymaps | grep -F "$included_item"`
-        for ii in $sss ; do
+            [ "$sss" = "" ] && sss=`find $KEYDIR/keymaps | grep -F "$included_item"`
+            for ii in $sss ; do
                 [ -e "$ii" ] && AddKeyboardMappingFile $ii
-        done
-    else
-        AddKeyboardMappingFile $included_item
-    fi
-    done
-}
-
-
-
-
-
+            done
+        else
+            AddKeyboardMappingFile $included_item
+        fi
+    done
+}
 
 
@@ -291 +283 @@
 
     sliceno=0
-    scratchfile=$TMP_ROOT/blah.$$.dat
+    scratchfile=$MONDOTMP/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-"
     [ "`echo "$filename" | grep -F "etc/termcap"`" != "" ] && StripComments $scratchfile "-$filename-"
     if [ "`echo "$filename" | grep -F "lib/modules/" | grep "\.*o\.gz"`" != "" ] ; then
-    mv $scratchfile $scratchfile.gz
-    gunzip -f $scratchfile || LogIt "Cannot gunzip $scratchfile.gz\n"
-    filename=`echo "$filename" | tr '.' '#' | sed s/#o#gz/#o/ | sed s/#ko#gz/#ko/ | tr '#' '.'`
+        mv $scratchfile $scratchfile.gz
+        gunzip -f $scratchfile || LogIt "Cannot gunzip $scratchfile.gz\n"
+        filename=`echo "$filename" | tr '.' '#' | sed s/#o#gz/#o/ | sed s/#ko#gz/#ko/ | tr '#' '.'`
     fi
     filesize=`du -sk $scratchfile | cut -f1`
@@ -339 +331 @@
 
 
-
-
 CopyDependenciesToDirectory() {
     local outdir incoming fname filesize counter
@@ -348 +338 @@
     counter=0
     while [ "$incoming" != "" ] ; do
-    if [ -d "$incoming" ] ; then
+        if [ -d "$incoming" ] ; then
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
         elif [ -e "$incoming" ] ; then
@@ -357 +347 @@
             else
                 cp --parents -Rdf $incoming $outdir || 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"
-        fi
-        [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
-            fi
-        counter=$(($counter+1))
-        if [ "$counter" -ge "5" ] ; then
-        counter=0
-            echo -en "."
-        fi
+                if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
+                    gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming\n"
+                fi
+                [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
+            fi
+            counter=$(($counter+1))
+            if [ "$counter" -ge "5" ] ; then
+                counter=0
+                echo -en "."
+            fi
         fi
         incoming=`ReadLine`
     done
 }
-
 
 
@@ -383 +372 @@
     echo -en "Formatting disk..."
     if which fdformat > /dev/null ; then
-    fdformat -n $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
+        fdformat -n $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
     elif which superformat > /dev/null ; then
-    superformat $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
-    else
-    Die "Please install either fdformat or superformat."
+        superformat $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
+    else
+        Die "Please install either fdformat or superformat."
     fi
     echo -en "\rWriting $comment"
     if echo $image | grep "mindi-[r|b]oot\.1440" &> /dev/null ; then
-    cat $image > $dev &
-    else
-    dd if=$image of=$dev &> /dev/null &
+        cat $image > $dev &
+    else
+        dd if=$image of=$dev &> /dev/null &
     fi
     procno=$!
@@ -407 +396 @@
 
 
-
-
-
 CountItemsIn() {
     local r
@@ -420 +406 @@
 
 
-
-
-
-
 CreateDataDiskImagesFromTarballs() {
     local tardir outdir diskno noof_disks kp
@@ -434 +416 @@
     echo -en "Creating data disk "
     while [ "$diskno" -le "$noof_disks" ] ; do
-    echo -en "#$diskno..."
-    cp -f $tardir/$diskno.tar.gz $outdir || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir\n"
+        echo -en "#$diskno..."
+        cp -f $tardir/$diskno.tar.gz $outdir || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir\n"
         CreateOneDataDiskImage $tardir/$diskno.tar.gz $outdir/mindi-data-$diskno.img $diskno $noof_disks
         diskno=$(($diskno+1))
@@ -453 +435 @@
     noof_disks=$4
 
-    mountpoint=$TMP_ROOT/mountpoint.$$
+    mountpoint=$MONDOTMP/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 > /tmp/mke2fs.$$ 2>> /tmp/mke2fs.$$
-    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
-    rm -f /tmp/mke2fs.$$
+    mke2fs -N 12 -F $imagefile > $MONDOTMP/mke2fs.$$ 2>> $MONDOTMP/mke2fs.$$
+    [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.$$
+    rm -f $MONDOTMP/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/
     if [ "$?" -ne "0" ] ; then
-    umount $mountpoint
-    Die "Tarball $tarball is too big for disk! (CODI)\nTell Dev Team to adjust MAX_COMPRESSED_SIZE"
+        umount $mountpoint
+        Die "Tarball $tarball is too big for disk! (CODI)\nTell Dev Team to adjust MAX_COMPRESSED_SIZE"
     fi
     [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
@@ -469 +451 @@
     rmdir $mountpoint || LogIt "Cannot rmdir (CODI)\n"
 }
-
 
 
@@ -481 +462 @@
 }
 
-
-
+# Last function called before exiting
+# Parameter is exit code value
+MindiExit() {
+    local my_partitions
+
+    echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE
+    echo "End date : `date`" >> $LOGFILE
+
+    sync
+    cd /
+
+    # Unmount whtat could remain mounted
+    my_partitions=`mount | grep -F $$ | cut -f1 -d' '`
+    [ "$my_partitions" != "" ] && umount $my_partitions
+    # Clean temporary files
+    rm -Rf $MONDOTMP $FDISKLOG
+    exit $1
+}
 
 Die() {
-    local my_partitions i
-    echo "MINDI_VERSION is $MINDI_VERSION" >> $LOGFILE
-    echo "End date : `date`" >> $LOGFILE
+    local i
     if [ "$1" = "" ] ; then
         LogIt "Fatal error\n"
@@ -493 +488 @@
         LogIt "Fatal error. $1\n"
     fi
-    sync
-    cd /
-
-    my_partitions=`mount | grep -F $$ | cut -f1 -d' '`
-    [ "$my_partitions" != "" ] && umount $my_partitions
-    # BCO : Too Dangerous !!!
-    #[ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
-    cd /tmp
-    mkdir -p mindi.err
-    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log /tmp/mountlist.txt.$$ $FDISKLOG ; do
-        [ -e "$i" ] && cp -f $i mindi.err/
-    done
-    rm -f mindi.err.*.tgz
-    tar -cf - mindi.err | gzip -9 > mindi.err.$$.tgz
-    rm -Rf mindi.err /tmp/mountlist.txt.$$ mindilinux $FDISKLOG
-    LogIt "Please e-mail a copy of /tmp/mindi.err.$$.tgz to the mailing list.\n"
+
+    # 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
+    done
+    rm -f $TMPDIR/mindi.err.*.tgz
+    tar -cf - $MONDOTMP | 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"
     LogIt "WE CANNOT HELP unless you enclose that file.\n"
-    exit 1
-}
-
-
+    MindiExit -1
+}
 
 
@@ -545 +530 @@
         mv -f $filelist.tmp $filelist
     done
-    sort $filelist | $AWK '{ print $1; }' | uniq > $filelist.tmp
+    $AWK '{ print $1; }' $filelist | sort -u > $filelist.tmp
     mv -f $filelist.tmp $filelist
     echo -e "$DONE"
 }
-
-
 
 
@@ -631 +614 @@
 
 
-
-
-
 FindHomeOfMindiAndMondo() {
     [ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
@@ -641 +621 @@
     echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
     echo "MONDO_SHARE = $MONDO_SHARE" >> $LOGFILE
-    mkdir -p $CACHEDIR
-}
-
-
-
+}
 
 
@@ -659 +635 @@
 
 
-
 FindLiloBinary() {
     if which lilo &> /dev/null ; then
-    if which lilo.real > /dev/null 2> /dev/null ; then
-        LILO_EXE=lilo.real
-        LogIt "lilo.real found; will be used instead of lilo (*grumble* *mutter*)\n"
-    else
-        LILO_EXE=lilo
-    fi
-    $LILO_EXE -V | grep -F "21.6" > /dev/null && Die "Please upgrade LILO. Your verison has a serious bug. If you're not _using_ LILO, fine, uninstall it. :)"
-    else
-    LILO_EXE=`which false`
-    fi
-}
+        if which lilo.real > /dev/null 2> /dev/null ; then
+            LILO_EXE=lilo.real
+            LogIt "lilo.real found; will be used instead of lilo (*grumble* *mutter*)\n"
+        else
+            LILO_EXE=lilo
+        fi
+        $LILO_EXE -V | grep -F "21.6" > /dev/null && Die "Please upgrade LILO. Your version has a serious bug. If you're not _using_ LILO, fine, uninstall it. :)"
+    else
+        LILO_EXE=`which false`
+    fi
+}
+
 
 FindELiloBinary() {
     if which elilo &> /dev/null ; then
-    LILO_EXE=elilo
-    else
-    LILO_EXE=`which false`
+        LILO_EXE=elilo
+    else
+        LILO_EXE=`which false`
     fi
 }
@@ -684 +660 @@
 
 FixPathIfBroken() {
-        if [ -e "/sbin/mkfs" ] && ! which mkfs &> /dev/null ; then
+    if [ -e "/sbin/mkfs" ] && ! which mkfs &> /dev/null ; then
         PATH=$PATH:/sbin:/usr/sbin
         export PATH
@@ -692 +668 @@
     fi
 }
-
 
 
@@ -702 +677 @@
     if [ "`strings $i 2> /dev/null | head -n1`" = "LILO" ] ; then
         out="$out $i"
-            last="$i"
+        last="$i"
     fi
     done
     echo "$last"
 }
-
 
 
@@ -714 +688 @@
     pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-        cd $TMP_ROOT
+        cd $MONDOTMP
     else
         cd /
@@ -732 +706 @@
 
 
-
 GenerateGiantDependencyList() {
     local incoming loc fname list_of_files i tempfile outfile progress filelist res r mapfile mappath included_list included_item old_pwd tempdepfile modres noof_lines lvmversion lvmresolved
@@ -738 +711 @@
     echo -en "Analyzing dependency requirements"
     outfile=$1
-    tempfile=$TMP_ROOT/$$.txt
+    tempfile=$MONDOTMP/$$.txt
     incoming=`ReadLine`
 
@@ -747 +720 @@
     while [ "$incoming" != "" ] ; do
         if echo "$incoming" | grep -x " *#.*" &> /dev/null ; then
-#           echo "Skipping '$incoming'"
             incoming=`ReadLine`
             continue
@@ -754 +726 @@
             break
         fi
-#       echo "Processing '$incoming'."
-#       sleep 1
         filelist=`GenerateListForFile "$incoming"`
         r=$?
@@ -846 +816 @@
     noof_lines=`cat $tempfile | wc -l`
     for fname in `cat $tempfile` ; do
-        tempdepfile=`mktemp /tmp/mindilinux/tempdepfile.XXXXXX`
-        LocateDeps $fname > $tempdepfile
-    echo "$fname" >> $outfile.pre
-        cat $tempdepfile >> $outfile.pre
-        rm -f $tempdepfile
-    progress=$(($progress+1))
+        echo "$fname" >> $outfile.pre
+        LocateDeps $fname >> $outfile.pre
+        progress=$(($progress+1))
         echo -en "\r\t\t\t\t\t\t\t\t"
         i=$(($progress*100))
@@ -857 +824 @@
         echo -en "$i"
         echo -en "%"
-    modres=$(($progress%4))
+        modres=$(($progress%4))
         [ "$modres" -eq "0" ] && echo -en "\t/"
         [ "$modres" -eq "1" ] && echo -en "\t-"
@@ -864 +831 @@
     done
     if [ "`DidMondoCallMe`" ] ; then
-    mkdir -p $bigdir/tmp
-    mkdir -p $bigdir/sbin
-    mkdir -p $bigdir/bin
-    if [ -e "$MONDO_TMP/post-nuke.tgz" ] ; then
-        LogIt "\nIncorporating post-nuke tarball\n"
-        old_pwd=`pwd`
-        cd $bigdir
-        tar -zxf $MONDO_TMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball\n"
-        cd $old_pwd
-    fi
-    if cp -f $MONDO_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, $MONDO_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 $MONDO_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
-    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
-        LogIt "Incorporating NFS-related settings\n"
-        for r in NFS-* ISO-PREFIX ; do
-            cp -f $MONDO_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
-            echo "Copying $r to ramdisk" >> $LOGFILE
-        done
-    fi
-    fi
-     tr ' ' '\n' < $outfile.pre | tr -s '/' '/' | grep -Fvx "" | sort -u | grep -Ev "/libX11|/libXext|/libXi|/libgtk|/libgdk" > $outfile
+        mkdir -p $bigdir/tmp
+        mkdir -p $bigdir/sbin
+        mkdir -p $bigdir/bin
+        if [ -e "$MONDOTMP/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"
+            cd $old_pwd
+        fi
+        if cp -f $MONDOTMP/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 "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
+            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?"
+                echo "Copying $r to ramdisk" >> $LOGFILE
+            done
+        fi
+    fi
+    tr ' ' '\n' < $outfile.pre | tr -s '/' '/' | grep -Fvx "" | sort -u | grep -Ev "/libX11|/libXext|/libXi|/libgtk|/libgdk" > $outfile
     rm -f $tempfile $outfile.pre
     [ "$res" -eq "0" ] && echo -e "\r\t\t\t\t\t\t\t\t$DONE" || echo "\nFailed."
     return $res
 }
-
-
-
 
 
@@ -915 +879 @@
 
 
-
 # Returns all disk devices which are part of a raid array
-
 GetAllRaidMembers() {
     $AWK "/^[[:space:]]*#/ {next} /^[[:space:]]*device/ if(\$2) {print \$2}" < /etc/raidtab
@@ -929 +891 @@
     done
 }
-
 
 
@@ -940 +901 @@
 
 
-
-
-
 # Searches parent raid device of given disk device
 # $1: disk device (i.e. /dev/hda1)
-
 GetParentRaidDev() {
     $AWK "/^[[:space:]]*#/ {next} /^[[:space:]]*raiddev/ {dev=\$2} /^[[:space:]]*device/ {if(\$2==\"$1\") {print dev; exit}}" < /etc/raidtab
@@ -951 +908 @@
 
 
-
 # Searches members of raid device
 # $1: raid device (/dev/md...)
-
 GetRaidDevMembers() {
     $AWK "/^[[:space:]]*#/ {next} /^[[:space:]]*raiddev/ {if(dev) exit; if(\$2 == \"$1\") dev=\$2} /^[[:space:]]*device/ {if(dev) {print \$2}}" < /etc/raidtab
 }
-
-
-HackAwk() {
-    local pathname filename dir old_pwd new_fname
-    pathname=$1
-    filename=$2
-    dir=`echo "$pathname" | sed s/$filename//`
-    old_pwd=`pwd`
-    cd $dir
-    [ -f "$filename" ] || Die "Can't find $filename at $dir"
-    new_fname="an.icky.icky.spider.ewww"
-    [ "$filename" = "gawk" ] && new_fname="awk"
-    [ "$filename" = "awk" ] && new_fname="gawk"
-    ln -s $filename $new_fname
-    cd $old_pwd
-}
-
-
-
-
-HackMountlist() {
-    local scratchdir outfile partlist pst partstr \
-res partition swapsize
-    scratchdir=$TMP_ROOT
-    outfile=$1
-
-    mkdir -p $outfile
-    rm -Rf $outfile
-    > $outfile
-    partlist=$(mount | cut -d' ' -f1,3,5 \
-    | grep -Ev "((none|/tmp|/ISOs|/proc|/dev/root) )|/mnt/" \
-    | tr ' ' '|')
-
-    echo -n "Modifying mountlist..."
-
-    if [ ! -f "/mountlist.hacked" ] ; then
-        Die "Can't find modified mountlist.hacked!"
-    else
-        cp /mountlist.hacked "$outfile"
-        LogIt "Done. (Created by auto-archive, I assume?)\n"
-    fi
-}
-
-
 
 
@@ -1009 +920 @@
     incoming=`ReadLine`
     pwd=`pwd`
-    cd $TMP_ROOT
+    cd $MONDOTMP
     while [ "$incoming" != "" ] ; do
-    stub=`basename $incoming`
-    newpath=`FindSpecificModuleInPath lib/modules/$FAILSAFE_KVER $stub`
-    for i in $newpath ; do
-        echo "$i"
-    done
-    read incoming
+        stub=`basename $incoming`
+        newpath=`FindSpecificModuleInPath lib/modules/$FAILSAFE_KVER $stub`
+        for i in $newpath ; do
+            echo "$i"
+        done
+        read incoming
     done
     cd $pwd
 }
-
 
 
@@ -1027 +937 @@
 
     grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||LABEL\=\// && !/fdd|cdr|zip|floppy/ {print $1}'
-#    for partition in `$FDISK -l | tr -s ' ' '\n' | grep /dev` ; do 
-#        [ -e "$i" ] && all_partitions=echo "$i"
-#    done
     [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab
     return
 }
-
-
-
 
 
@@ -1047 +951 @@
     echo " "
 }
-
 
 
@@ -1076 +979 @@
     [ -f "$oss" ] && find $oss.* 2> /dev/null
 }
-
-
-#ListKernelModules() {
-    #local output q
-    #output=""
-    #for q in `lsmod | sed -n '2,$s/ .*//p'` ; do
-        #output="$q $output"
-    #done
-    #echo "`lsmod | sed -n '2,$s/ .*//p'`"
-#}
-
 
 
@@ -1112 +1004 @@
 }
 
+
 # Give all symlinks recursively of a full path name
 ReadAllLink() {
@@ -1133 +1026 @@
     fi  
 }
+
 
 LocateFile() {
@@ -1165 +1059 @@
 
 
-
 LogIt() {
     if [ -e /dev/stderr ] ; then
-    echo -e "$1" >> /dev/stderr
+        echo -e "$1" >> /dev/stderr
     elif [ -e /usr/bin/logger ] ; then
-    /usr/bin/logger -s $1
+        /usr/bin/logger -s $1
     fi
     echo -en "$1" >> $LOGFILE
@@ -1176 +1069 @@
 
 
-
-
-
-
-
 # Called by TurnTgzIntoRdz, to make /tmp/mondo-restore.cfg
-
 MakeMondoConfigFile() {
     local outfile use_lzo use_comp use_star
@@ -1200 +1087 @@
     echo "datestamp `date`" >> $outfile
     [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
-   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
-   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
-   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-BROADCAST nfs-client-broadcast $outfile
-   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
-   AddFileToCfgIfExists $MONDO_TMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
-   AddFileToCfgIfExists $MONDO_TMP/NFS-SERVER-PATH   nfs-server-path   $outfile
-   AddFileToCfgIfExists $MONDO_TMP/NFS-DEV           nfs-dev           $outfile
-   AddFileToCfgIfExists $MONDO_TMP/NFS-SERVER-IPADDR nfs-server-ipaddr $outfile
-   AddFileToCfgIfExists $MONDO_TMP/ISO-DEV           iso-dev           $outfile
-   AddFileToCfgIfExists $MONDO_TMP/ISO-MNT           iso-mnt           $outfile
-   AddFileToCfgIfExists $MONDO_TMP/ISO-PREFIX        iso-prefix        $outfile
-   AddFileToCfgIfExists $MONDO_TMP/ISODIR            isodir            $outfile
-   AddFileToCfgIfExists $MONDO_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
-   AddFileToCfgIfExists $MONDO_TMP/BOOTLOADER.NAME   bootloader.name   $outfile
-   AddFileToCfgIfExists $MONDO_TMP/KEYMAP-LIVES-HERE keymap-lives-here $outfile
-   AddFileToCfgIfExists $MONDO_TMP/TAPEDEV-HAS-DATA-DISKS tapedev-has-data-disks $outfile
-   AddFileToCfgIfExists $MONDO_TMP/BACKUP-MEDIA-TYPE backup-media-type $outfile
-   AddFileToCfgIfExists $MONDO_TMP/DIFFERENTIAL      differential      $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
+}
 
 
@@ -1232 +1117 @@
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
         kver=$FAILSAFE_KVER
-        cd $TMP_ROOT
+        cd $MONDOTMP
         searchpath=lib/modules/$kver
     else
@@ -1241 +1126 @@
         if [ "${kernelname}" != "" ]
         then
-          kver=${kernelname}
+            kver=${kernelname}
         else
-          kver=`uname -r`
+            kver=`uname -r`
         fi
 ###
@@ -1253 +1138 @@
     echo -en "for outerloop in 1 2 3 4 5 ; do\necho -en \".\"\n" >> $outfile
     list_to_echo="`lsmod | sed -n '2,$s/ .*//p'`"
-#    LTE=`echo "$list_to_echo" | tr ' ' '\n' | grep -n "" | cut -d':' -f2,3,4 | tr '\n' ' '`
-#    lte_old="$LTE"
-#    LTE=""
-#    for q in $lte_old ; do
-#   LTE="$q $LTE"
-#    done
-#echo "LTE = '$LTE'" >> $LOGFILE
+
     # Make temporary modprobe.conf file if we are told so
     if [ $tmpmodprobe_flag == "Y" ] ; then
-        infile="/tmp/modprobe.conf.mindi.$$"
+        infile="$MONDOTMP/modprobe.conf.mindi"
         find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
     else
@@ -1284 +1163 @@
     echo "echo \"Done.\"" >> $outfile
     chmod +x $outfile
-#    cp $outfile /tmp/out.txt
     cd /
     # Remove temporary modprobe.conf file if we have created one
@@ -1291 +1169 @@
     fi
 }
-
-
-
 
 
@@ -1307 +1182 @@
 
 # scratchdir, mountlist(OUT)
-    scratchdir=$TMP_ROOT
+    scratchdir=$MONDOTMP
     mountlist=$1
 
@@ -1335 +1210 @@
     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
     for c_p in $all_partitions ; do
-#        echo "c_p = $c_p" > /dev/stderr
         [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] && continue
         [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
@@ -1424 +1298 @@
                 current_partition=$actual_dev
             else
-                    Die "Your system uses a labelled partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id\n"
+                Die "Your system uses a labelled partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id\n"
             fi
         else
@@ -1561 +1435 @@
 
 
-
-
-
-
 MakeSureNumberIsInteger() {
     res=`echo "$1" | tr -s '\-[0-9]' ' '`
@@ -1572 +1442 @@
     fi
 }
-
-
-
 
 
@@ -1589 +1456 @@
     rm -f $1.tmp
     if [ "$CDRECOVERY" != "yes" ] ; then
-        if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
+        if [ -e "$MONDOTMP/NFS-DEV" ] ; then
             echo -en "Press <enter> to continue.\n" >> $1
-        elif [ ! "$MONDO_TMP" ] ; then
+        elif [ ! "$MONDOTMP" ] ; then
             echo -en "FYI, this is _not_ a Mondo Rescue CD.\n" >> $1
             if [ -e "$MINDI_LIB/memtest.img" ] ; then
@@ -1605 +1472 @@
     fi
 }
-
-
 
 
@@ -1637 +1502 @@
 
 
+OfferToCopyImagesToDisks() {
+    local imagesdir i imagename dev count boot_dev data_dev
+    imagesdir=$1
+    boot_dev=$2
+    data_dev=$3
+
+    echo -en "Would you like to create boot+data floppy disks now (y/n) ?"
+    read i
+    [ "$i" != "y" ] && [ "$i" != "Y" ] && return
+    mount | grep -F /dev/fd > /dev/null && Die "Please unmount your floppies first."
+    echo "WARNING! THIS WILL ERASE YOUR FLOPPY DISKS."
+    [ ! -e "$boot_dev" ] && Die "Cannot find $boot_dev - is your Linux distro broken?"
+    [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
+    i=`find $imagesdir -type f | grep -F "/mindi-root.1" 2> /dev/null`
+    j=`find $imagesdir -type f | grep -F "/mindi-boot" | grep -Ev '2880|5760'`
+    if [ "$i" ] ; then
+        CopyImageToDisk $j $data_dev "boot disk"
+        CopyImageToDisk $i $data_dev "root disk"
+    else
+        CopyImageToDisk $j $boot_dev "boot/root disk"
+    fi
+    count=1
+    for i in `find $imagesdir | grep -F mindi-data` ; do
+        CopyImageToDisk $i $data_dev "data disk #$count"
+        count=$(($count+1))
+    done
+}
+
+
 OfferToMakeBootableISO() {
     local i old_pwd
@@ -1644 +1538 @@
         [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
     fi
-    if [ ! "$MONDO_TMP" ] ; then
+    if [ ! "$MONDOTMP" ] ; 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 $TMP_ROOT/iso
-    mkdir -p $TMP_ROOT/iso/{images,archives,isolinux}
-    cp -f $1/*.img $1/*.gz $TMP_ROOT/iso/images || LogIt "OfferToMakeBootableISO: Cannot copy $i to $TMP_ROOT/iso/images\n"
+    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"
     old_pwd=`pwd`
-    cd $TMP_ROOT/iso
+    cd $MONDOTMP/iso
     mkdir -p $MONDO_ROOT/iso/isolinux
     echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
@@ -1658 +1552 @@
     for i in memdisk memtest.bin memtest.img ; do
     j=$MINDI_LIB/$i
-    k=$TMP_ROOT/iso/isolinux
+    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 $TMP_ROOT || Die "Failed to copy $j to $k"
-    fi
-    done
-    MakeSyslinuxMessageFile $TMP_ROOT/iso/isolinux/message.txt
-    cp $kernelpath $TMP_ROOT/iso/isolinux/vmlinuz || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
-    cp $TMP_ROOT/mindi.rdz $TMP_ROOT/iso/isolinux/initrd.img
-    cp $TMP_ROOT/mindi.rdz $CACHEDIR/initrd.img
+        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
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
-    cd $TMP_ROOT/iso/isolinux
-    cat $iso_cfg_file | HackSyslinuxFile $ramdisk_size $TMP_ROOT/iso > isolinux.cfg || Die "Cannot copy isolinux.cfg from mindi_home to tmp_root - did you run out of disk space?"
-    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
+    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
         mv isolinux.cfg isolinux.cfg.old
         sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
@@ -1680 +1574 @@
         cp $ISOLINUX ../
     fi
-    cd $TMP_ROOT/iso
+    cd $MONDOTMP/iso
     if [ "$ARCH" != "ia64" ] ; then
-        cp -f $TMP_ROOT/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 $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?"
     fi
     [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
-    if [ -d "/home/MondoCD" ] ; then
-        cp -pRdu /home/MondoCD/* .
-    fi
     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
@@ -1694 +1585 @@
     fi
     if [ "$?" -ne "0" ] ; then
-    echo "----------- mkisofs's errors --------------" >> $LOGFILE
-    cat /tmp/$$.mk >> $LOGFILE
-    echo "mkisofs returned the following errors:-"
-    cat /tmp/$$.mk
-    LogIt "Failed to create ISO image.\n"
-    else
-    echo "Created bootable ISO image at $CACHEDIR/mindi.iso" >> $LOGFILE
-    fi
-    rm -f /tmp/$$.mk
+        echo "----------- mkisofs's errors --------------" >> $LOGFILE
+        cat $MONDOTMP/mkisofs.log >> $LOGFILE
+        echo "mkisofs returned the following errors:-"
+        cat $MONDOTMP/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
     cd $old_pwd
 }
-
 
 
@@ -1711 +1601 @@
     [ "$1" -gt "1" ] && echo -en "s"
 }
-
-
 
 
@@ -1724 +1612 @@
     fi
     if [ "$disksize" -gt "2880" ] ; then
-    if [ "`DidMondoCallMe`" ] ; then
-        if [ "$CDRECOVERY" != "yes" ] ; then
-            if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
-                echo -en "Press <enter> to continue.\n"
-            elif [ ! "$MONDO_TMP" ] ; then
-                echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
-            else
-                echo -en "$BOOT_MEDIA_MESSAGE"
+        if [ "`DidMondoCallMe`" ] ; then
+            if [ "$CDRECOVERY" != "yes" ] ; then
+                if [ -e "$MONDOTMP/NFS-DEV" ] ; then
+                    echo -en "Press <enter> to continue.\n"
+                elif [ ! "$MONDOTMP" ] ; then
+                    echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
+                else
+                    echo -en "$BOOT_MEDIA_MESSAGE"
+                fi
             fi
         fi
-    fi
     fi
     if [ "$CDRECOVERY" = "yes" ] ; then
@@ -1743 +1631 @@
     echo -en "\n\n\n"
 }
-
-
 
 
@@ -1756 +1642 @@
     rand1=$RANDOM
     rand2=$RANDOM
-    image=/tmp/$rand1.$rand2.img
-    mtpt=/tmp/$rand1.$rand2.mtpt
+    image=$MONDOTMP/$rand1.$rand2.img
+    mtpt=$MONDOTMP/$rand1.$rand2.mtpt
     dd if=/dev/zero of=$image bs=1k count=$disksize
     mke2fs -N 26 -F $image > /dev/null
@@ -1783 +1669 @@
     CopyBootBFile $mtpt/boot.b
 
-#    echo "root=/dev/loop0" > bdlilo.conf
     MakeLiloConfFile $disksize >> bdlilo.conf
-
-#    cat bdlilo.conf > /tmp/bdlilo.conf
-
-#    cat /home/mondostuff/bdlc > bdlilo.conf
 
     chmod 644 bdlilo.conf
@@ -1795 +1676 @@
     res=$?
 
-#echo "lilo -v -C bdlilo.conf -r $mtpt"
-#echo -en "Press enter"; read line
-
     cd $old_pwd
     umount $mtpt
@@ -1804 +1682 @@
 
     return $res
-
-}
-
-
-
-
+}
 
 
@@ -1816 +1689 @@
     disksize=$1
     options=""
-        if [ "$ARCH" != "ia64" ] ; then
-            echo -en "boot=/dev/loop0\ndisk=/dev/loop0\n"
-        fi
-        if [ "$disksize" -eq "2880" ] ; then
-            echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
-        elif [ "$disksize" -eq "1722" ] ; then
-            echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
-        elif [ "$disksize" -gt "2880" ] ; then
-            /bin/true
-        else
-            echo -en "bios=0x00\nsectors=18\nheads=2\ncylinders=80\n"
-        fi
-        if [ "$ARCH" != "ia64" ] ; then
-            echo -en "install=/boot.b\nmap=/boot.map\n"
-        fi
+
+    if [ "$ARCH" != "ia64" ] ; then
+        echo -en "boot=/dev/loop0\ndisk=/dev/loop0\n"
+    fi
+    if [ "$disksize" -eq "2880" ] ; then
+        echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
+    elif [ "$disksize" -eq "1722" ] ; then
+        echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
+    elif [ "$disksize" -gt "2880" ] ; then
+        /bin/true
+    else
+        echo -en "bios=0x00\nsectors=18\nheads=2\ncylinders=80\n"
+    fi
+    if [ "$ARCH" != "ia64" ] ; then
+        echo -en "install=/boot.b\nmap=/boot.map\n"
+    fi
     if [ "$CDRECOVERY" = "yes" ] ; then
         echo -en "default=RESTORE\n"
     elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
-        if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
+        if [ -e "$MONDOTMP/NFS-DEV" ] ; then
             echo -en "default=iso\n"
         else
@@ -1848 +1722 @@
     fi
     if [ "$CDRECOVERY" != "yes" ] ; then
-    echo -en "timeout=300\n"
+        echo -en "timeout=300\n"
     fi
     echo -en "\n"
     if [ "$CDRECOVERY" = "yes" ] ; then
-    options="RESTORE expert"
+        options="RESTORE expert"
     elif [ "$disksize" -gt "2880" ] ; then
         if [ "`DidMondoCallMe`" ] ; then
-            if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
+            if [ -e "$MONDOTMP/NFS-DEV" ] ; then
                 options="iso"
             else
@@ -1863 +1737 @@
         else
             options="expert"
-    fi
+        fi
     else
         options="expert"
     fi
     for i in $options ; do
-    ooo=$i
-    [ "$ooo" = "RESTORE" ] && ooo="nuke"
-    if [ "$ARCH" = "ia64" ] ; then
-        rootpart="root=/dev/ram0\n\t"
-    else
-        rootpart=""
-    fi
-    outstr="image=vmlinuz\n\tlabel=$i\n\tinitrd=/mindi.rdz\n\t${rootpart}append=\" rw ramdisk=$ramdisksize ramdisk_size=$ramdisksize maxcpus=1 $ooo_mode $ADDITIONAL_BOOT_PARAMS"
+        ooo=$i
+        [ "$ooo" = "RESTORE" ] && ooo="nuke"
+        if [ "$ARCH" = "ia64" ] ; then
+            rootpart="root=/dev/ram0\n\t"
+        else
+            rootpart=""
+        fi
+        outstr="image=vmlinuz\n\tlabel=$i\n\tinitrd=/mindi.rdz\n\t${rootpart}append=\" rw ramdisk=$ramdisksize ramdisk_size=$ramdisksize maxcpus=1 $ooo_mode $ADDITIONAL_BOOT_PARAMS"
     
-    outstr=$outstr" $ooo_mode"
-    outstr=$outstr"\"\n"
-    if [ "$disksize" = "1440" ] ; then
-        echo -en "$outstr" | sed s/initrd=.*// | grep -v root=
-    else
-        echo -en "$outstr"
-    fi
-    done
-}
-
-
+        outstr=$outstr" $ooo_mode"
+        outstr=$outstr"\"\n"
+        if [ "$disksize" = "1440" ] ; then
+            echo -en "$outstr" | sed s/initrd=.*// | grep -v root=
+        else
+            echo -en "$outstr"
+        fi
+    done
+}
 
 
@@ -1900 +1772 @@
     [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
     echo -en "Making "$disksize"KB boot disk..."
-    TurnTgzIntoRdz $MINDI_LIB/rootfs $TMP_ROOT/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 $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?"
     if [ "$ARCH" != "ia64" ] ; then
         [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
@@ -1906 +1778 @@
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$disksize.img
-    mountpoint=$TMP_ROOT/mountpoint.$$
+    mountpoint=$MONDOTMP/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 > /tmp/mke2fs.$$ 2>> /tmp/mke2fs.$$
+        mkdosfs $imagefile > $MONDOTMP/mke2fs.log 2>> $MONDOTMP/mke2fs.log
     t=vfat
     else
-        mke2fs -N 26 -m 0 -F $imagefile > /tmp/mke2fs.$$ 2>> /tmp/mke2fs.$$
+        mke2fs -N 26 -m 0 -F $imagefile > $MONDOTMP/mke2fs.log 2>> $MONDOTMP/mke2fs.log
     t=ext2
     fi
-    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
-    rm -f /tmp/mke2fs.$$
+    [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.log
+    rm -f $MONDOTMP/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
@@ -1924 +1796 @@
         liloconf=$mountpoint/etc/lilo.conf
     else
-    liloconf=$mountpoint/elilo.conf
+        liloconf=$mountpoint/elilo.conf
     fi
     old_pwd=`pwd`
@@ -1938 +1810 @@
     MakeLiloConfFile $disksize > $liloconf
 
-    echo "Copying $TMP_ROOT/mindi.rdz to $mountpoint..." >> $LOGFILE
-    cp -f $TMP_ROOT/mindi.rdz $mountpoint 2>> $LOGFILE
+    echo "Copying $MONDOTMP/mindi.rdz to $mountpoint..." >> $LOGFILE
+    cp -f $MONDOTMP/mindi.rdz $mountpoint 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-    LogIt "Failed to copy $TMP_ROOT/mindi.rdz to $mountpoint\n"
-    cat $TMP_ROOT/mtpt.$$ >> $LOGFILE
-    LogIt "Please unload some of your modules and try again.\n"
-    rm -f $TMP_ROOT/mtpt.$$
-    LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
+        LogIt "Failed to copy $MONDOTMP/mindi.rdz to $mountpoint\n"
+        cat $MONDOTMP/mtpt.$$ >> $LOGFILE
+        LogIt "Please unload some of your modules and try again.\n"
+        rm -f $MONDOTMP/mtpt.$$
+        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
         retval=$(($retval+1))
     fi
@@ -1951 +1823 @@
 
     mkdir -p $mountpoint/tmp
-    cp -f $TMP_ROOT/mondo-restore.cfg $mountpoint/tmp &> /dev/null
+    cp -f $MONDOTMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
     if [ -e "$MINDI_LIB/memtest.img" ] ; then
         echo -en "image=/memtest.bin\nlabel=memtest\nn" >> $liloconf
@@ -1957 +1829 @@
 #        echo "Yep, this is a multi-function CD" > $mountpoint/MULTIFUNC
     fi
-    if [ -d "/home/MondoCD" ] ; then
-    cp -pRdu /home/MondoCD/* . || Die "Cannot do kung pow"
-    fi
-
-# copy the kernel across
+
+    # copy the kernel across
     rm -Rf $mountpoint/lost+found
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
@@ -1967 +1836 @@
     cp -f $kernelpath $mountpoint/vmlinuz > /dev/null 2> /dev/null
     if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
-    echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
-    du -sk $mountpoint/* >> $LOGFILE
-    echo "--- end of list of files ---" >> $LOGFILE
-    echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
+        echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
+        du -sk $mountpoint/* >> $LOGFILE
+        echo "--- end of list of files ---" >> $LOGFILE
+        echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
 Sorry, your kernel is too big for a boot/root floppy.\nI'll try the new boot/root two-disk thingy.\n" >> $LOGFILE
         rm -f $mountpoint/vmlinuz
-    cd $old_pwd
+        cd $old_pwd
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
-#   losetup /dev/loop0 -d
-    res=0
+    #   losetup /dev/loop0 -d
+        res=0
         write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
-    res=$(($res+$?))
-        cp -f $TMP_ROOT/mindi.rdz $imagesdir/mindi-root.1440.img
-    res=$(($res+$?))
-    rm -f $imagefile
-    if [ "$res" -ne "0" ]; then
-        LogIt "Warning - failed to create 1.44MB boot/root floppies\n"
-        rm -f $imagesdir/mindi-*.1440.img
-    fi
-    return $res
+        res=$(($res+$?))
+        cp -f $MONDOTMP/mindi.rdz $imagesdir/mindi-root.1440.img
+        res=$(($res+$?))
+        rm -f $imagefile
+        if [ "$res" -ne "0" ]; then
+            LogIt "Warning - failed to create 1.44MB boot/root floppies\n"
+            rm -f $imagesdir/mindi-*.1440.img
+        fi
+        return $res
     fi
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
@@ -2004 +1873 @@
     elif [ ! "$KERN_DISK_MADE" ] ; then
 # 12/28/2001 - if 1.72MB floppy then don't use LILO's optimizations at all
-    $LILO_EXE -r $mountpoint >> $LOGFILE 2>> $LOGFILE
-    else
-    echo "Not running LILO. It's not that kind of disk." >> $LOGFILE
-    fi
+        $LILO_EXE -r $mountpoint >> $LOGFILE 2>> $LOGFILE
+    else
+        echo "Not running LILO. It's not that kind of disk." >> $LOGFILE
+    fi
+
+    # BERLIOS  does not test necessarily what it expects
     if [ $? -ne "0" ] ; then
-    if [ "`grep -F "/tmp/dev.0" $LOGFILE`" ] ; then
-        LogIt "The '/tmp/dev.0' error is NOT Mindi's fault. It is LILO's.\n"
-        LogIt "Please reboot your PC as a workaround.\n"
-        Die "LILO sneezed and Mindi caught a cold. Please read the README / FAQ.\n"
-    fi
-    echo "$LILO_EXE -r $mountpoint ...failed."
-    echo -en "Press ENTER to continue."; read line
-    LogIt "Cannot run lilo on $mountpoint\nPlease upgrade/downgrade your version of LILO. It has a bug.\n"
-    retval=$(($retval+1))
-    fi
-    cp -f $liloconf /tmp/lilo.conf
+        if [ "`grep -F "/tmp/dev.0" $LOGFILE`" ] ; then
+            LogIt "The '/tmp/dev.0' error is NOT Mindi's fault. It is LILO's.\n"
+            LogIt "Please reboot your PC as a workaround.\n"
+            Die "LILO sneezed and Mindi caught a cold. Please read the README / FAQ.\n"
+        fi
+        echo "$LILO_EXE -r $mountpoint ...failed."
+        echo -en "Press ENTER to continue."; read line
+        LogIt "Cannot run lilo on $mountpoint\nPlease upgrade/downgrade your version of LILO. It has a bug.\n"
+        retval=$(($retval+1))
+    fi
+    cp -f $liloconf $MONDOTMP/lilo.conf
     if [ "$ARCH" = "ia64" ] ; then
         cp `dirname $kernelpath`/*.efi $mountpoint
@@ -2039 +1910 @@
     return $retval
 }
-
-
 
 
@@ -2052 +1921 @@
     local retval old_pwd
     retval=0
+
     [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
     echo -en "Making "$disksize"KB boot disk..."
-    TurnTgzIntoRdz $MINDI_LIB/rootfs $TMP_ROOT/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 $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?"
     [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$disksize.img
-    mountpoint=$TMP_ROOT/mountpoint.$$
+    mountpoint=$MONDOTMP/mountpoint.$$
     mkdir -p $mountpoint
 # If I format a 1722KB data file & run syslinux on it, the resultant image
@@ -2074 +1944 @@
     fi
     mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
-# copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
+
+    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     old_pwd=`pwd`
     MakeSyslinuxMessageFile $mountpoint/message.txt
     cd $mountpoint
     [ -e "$sys_cfg_file" ] || Die "Obi Wan, word up?"
-#    tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz\n" <--- present for LILO; is it nec. for SYSLINUX too?
     cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
-    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
+    if [ -e "$MONDOTMP/NFS-DEV" ] ; then
         mv syslinux.cfg syslinux.cfg.orig
         sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
     fi
     cd $old_pwd
-    echo "Copying $TMP_ROOT/mindi.rdz to $mountpoint/initrd.img..." >> $LOGFILE
-    cp -f $TMP_ROOT/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
+    echo "Copying $MONDOTMP/mindi.rdz to $mountpoint/initrd.img..." >> $LOGFILE
+    cp -f $MONDOTMP/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $TMP_ROOT/mindi.rdz to $mountpoint\n"
-        cat $TMP_ROOT/mtpt.$$ >> $LOGFILE
+        LogIt "Failed to copy $MONDOTMP/mindi.rdz to $mountpoint\n"
+        cat $MONDOTMP/mtpt.$$ >> $LOGFILE
         LogIt "Please unload some of your modules and try again.\n"
-        rm -f $TMP_ROOT/mtpt.$$
+        rm -f $MONDOTMP/mtpt.$$
         LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
         retval=$(($retval+1))
@@ -2098 +1968 @@
 
     mkdir -p $mountpoint/tmp
-    cp -f $TMP_ROOT/mondo-restore.cfg $mountpoint/tmp &> /dev/null
-
-# copy the kernel across
+    cp -f $MONDOTMP/mondo-restore.cfg $mountpoint/tmp &> /dev/null
+
+    # copy the kernel across
     rm -Rf $mountpoint/lost+found
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
@@ -2115 +1985 @@
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
-#   losetup /dev/loop0 -d
 
         res=0
         write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
         res=$(($res+$?))
-        cp -f $TMP_ROOT/mindi.rdz $imagesdir/mindi-root.1440.img
+        cp -f $MONDOTMP/mindi.rdz $imagesdir/mindi-root.1440.img
         res=$(($res+$?))
         rm -f $imagefile
@@ -2133 +2002 @@
     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
     mkdir -p $mountpoint/etc
@@ -2162 +2032 @@
     imagesdir=$1
     rm -f $imagesdir/mindi-*.img $imagesdir/[0-9]*.tar.gz $imagesdir/mindi.iso
-    needlist=$TMP_ROOT/what-we-need.txt
-    bigdir=$TMP_ROOT/bigdir
-    minidir_root=$TMP_ROOT/minidir
+    needlist=$MONDOTMP/what-we-need.txt
+    bigdir=$MONDOTMP/bigdir
+    minidir_root=$MONDOTMP/minidir
     mkdir -p $minidir_root
     mkdir -p $bigdir/usr/bin
-    tardir=$TMP_ROOT/tardir
+    tardir=$MONDOTMP/tardir
 
     lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
@@ -2173 +2043 @@
     res=$?
     if [ "$YOUR_KERNEL_SUCKS" ]; then
-    pwd=`pwd`
-    cd $TMP_ROOT
+        pwd=`pwd`
+        cd $MONDOTMP
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-        cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
-        if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
-        cp --parents -pRdf $i $bigdir
-        else
-        ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
-        BIGNO=$(($BIGNO+1))
-        fi
-    done
-    for i in $EXTRA_MODS ; do
-        j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
-        [ ! "$j" ] && echo "Warning - cannot find failsafe module $i.o" >> $LOGFILE
-        for k in $j ; do
-        if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-            cp --parents -pRdf $k $bigdir
-        else
-            ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
-            BIGNO=$(($BIGNO+1))
-        fi
-        echo "Added failsafe module $k to ramdisk" >> $LOGFILE
+            cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
+            if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
+                cp --parents -pRdf $i $bigdir
+            else
+                ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
+                BIGNO=$(($BIGNO+1))
+            fi
         done
-    done
-    cd $pwd
-    else
-    ListKernelModulePaths >> $needlist
+        for i in $EXTRA_MODS ; do
+            j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
+            [ ! "$j" ] && echo "Warning - cannot find failsafe module $i.o" >> $LOGFILE
+            for k in $j ; do
+                if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
+                    cp --parents -pRdf $k $bigdir
+                else
+                    ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
+                    BIGNO=$(($BIGNO+1))
+                fi
+                echo "Added failsafe module $k to ramdisk" >> $LOGFILE
+            done
+        done
+        cd $pwd
+    else
+        ListKernelModulePaths >> $needlist
     fi
     if [ "$res" -ne "0" ] ; then
@@ -2207 +2077 @@
     mkdir -p $bigdir/tmp
     if [ "`DidMondoCallMe`" ] ; then
-        MakeMondoConfigFile $TMP_ROOT/mondo-restore.cfg
-        cp -f $TMP_ROOT/mondo-restore.cfg $bigdir/tmp &> /dev/null
-        cp -f $TMP_ROOT/mondo-restore.cfg $CACHE_LOC &> /dev/null
+        MakeMondoConfigFile $MONDOTMP/mondo-restore.cfg
+        cp -f $MONDOTMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
     fi
     [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
@@ -2216 +2085 @@
     CopyDependenciesToDirectory < $needlist $bigdir
 
-# also copy io.sys and msdos.sys, if we can find them
+    # also copy io.sys and msdos.sys, if we can find them
     for i in `mount | cut -d' ' -f3` ; do
-    for j in io.sys msdos.sys ; do
-        [ -e "$i/$j" ] && cp -f $i/$j $bigdir
-    done
-    done
-
-# master boot record, too
-    i=`cat $MONDO_TMP/BOOTLOADER.DEVICE 2> /dev/null`
+        for j in io.sys msdos.sys ; do
+            [ -e "$i/$j" ] && cp -f $i/$j $bigdir
+        done
+    done
+
+    # master boot record, too
+    i=`cat $MONDOTMP/BOOTLOADER.DEVICE 2> /dev/null`
     if [ "$i" ] ; then
-    LogIt "Backing up $i's MBR\n"
-    dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
-# < < E O F
-    sleep 1
-    sync
-#        [ "$?" -ne "0" ] && echo "Failed to save $i's MBR to bigdir" >> $LOGFILE
-    j=$i
-    [ -h "$j" ] && j=`readlink -f $j`
-    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"
-    fi
-
-# more stuff
-#    cp -f $MINDI_LIB/embleer* $bigdir
+        LogIt "Backing up $i's MBR\n"
+        dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
+        sleep 1
+        sync
+        j=$i
+        [ -h "$j" ] && j=`readlink -f $j`
+        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"
+    fi
+
     old_pwd=`pwd`
     cd $bigdir
@@ -2247 +2112 @@
     cp -Rdf $MINDI_LIB/aux-tools/* . 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping aux-tools\n"
     if [ -e "$MINDI_LIB/x11-tools.tgz" ] ; then
-    tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
+        tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
     fi
     if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
@@ -2265 +2130 @@
 #        EXTRA_SPACE=$(($EXTRA_SPACE*2))
 #    fi
-    MakeMountlist $TMP_ROOT/mountlist.txt
+    MakeMountlist $MONDOTMP/mountlist.txt
     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 $CACHE_LOC
-    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_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/.
     [ $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
@@ -2275 +2139 @@
     CreateDataDiskImagesFromTarballs $tardir $imagesdir $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
+    # One 1.72MB boot disk, one 2.88MB boot disk and $noof_disks data disk images
     rmdir $tardir $bigdir
     rm -f $needlist
@@ -2297 +2161 @@
 
 
-
 Prompt() {
     echo -en "$1"
     read line
 }
-
 
 
@@ -2310 +2172 @@
     i=0
     while [ "$i" -le "32" ] && [ "$incoming" = "" ] ; do
-    i=$(($i+1))
-    read incoming
+        i=$(($i+1))
+        read incoming
     done
     echo "$incoming"
 }
-
 
 
@@ -2331 +2192 @@
             [ -h "$minidir_root/$diskno/$fname" ] && MoveHyperlinkSensibly $fname $minidir_root $diskno $noof_disks
         done
-    diskno=$(($diskno+1))
-    done
-
+        diskno=$(($diskno+1))
+    done
 
     cd $old_pwd
     return
-
-
-
-# do some awk/gawk stuff
-    cd $minidir_root
-    awk_loc=`find -name awk`
-    gawk_loc=`find -name gawk`
-    if [ "$awk_loc" = "" ] && [ "$gawk_loc" != "" ] ; then
-        for i in $gawk_loc ; do HackAwk $i gawk ; done
-    elif [ "$gawk_loc" = "" ] && [ "$awk_loc" != "" ] ; then
-        for i in $awk_loc ; do HackAwk $i awk ; done
-    elif [ "$gawk_loc" != "" ] && [ "$awk_loc" != "" ] ; then
-        echo -en "Gawk/awk found. Good.\r"
-    else
-        Die "Look, I don't want to come across as having an attitude, but you need either awk or gawk. Get a distro that doesn't suck, okay? :-)"
-    fi
-    cd $old_pwd
 }
 
@@ -2359 +2202 @@
 ReplaceIndividualLine() {
     local orig_file new_file lino newstring lines_total lines_remaining
+
     orig_file=$1.orig
     mv -f $1 $orig_file || Die "Cannot move $1 to $orig_file"
@@ -2365 +2209 @@
     newstring="$3"
     if [ "$lino" = "" ] || [ "$lino" -lt "1" ] ; then
-    echo "Can't find string" >> $LOGFILE
-    return 1
+        echo "Can't find string" >> $LOGFILE
+        return 1
     fi
     lines_total=`wc -l $orig_file | gawk '{print $1;}'`
@@ -2375 +2219 @@
     tail -n$lines_remaining $orig_file >> $new_file
     echo "Replace line $lino of $new_file with user-specified line, '$newstring'" >> $LOGFILE
-#    cp -f $new_file /tmp/init.new
     [ -x "$orig_file" ] && chmod +x $new_file
     rm -f $orig_file
@@ -2389 +2232 @@
     done
 }
-
 
 
@@ -2396 +2238 @@
     device=$1
     if [ "`echo "$device" | grep -F "/dev/md"`" != "" ] ; then
-    res=`SizeOfRaidPartition $device`
-    [ "$res" = "" ] && Die "Cannot find $device's size - is your /etc/raidtab sane?"
-    echo "$res"
-    return 0
-    fi
-#    res=`$FDISK -l 2>> $LOGFILE | grep -w "$device" | head -n1 | sort -u | tr '*' ' ' | tr -s '\t' '|' | tr -s ' ' ' ' | cut -d' ' -f4 | sed s/+// | sed s/-//`
-# patch from Bill <bill@iwizard.biz> - 2003/08/25
+        res=`SizeOfRaidPartition $device`
+        [ "$res" = "" ] && Die "Cannot find $device's size - is your /etc/raidtab sane?"
+        echo "$res"
+        return 0
+    fi
+    # patch from Bill <bill@iwizard.biz> - 2003/08/25
     res=`$FDISK -s $device`
     echo "------- $FDISK -l $device log ------------" >> $LOGFILE
     cat $FDISKLOG >> $LOGFILE
     echo "------- $FDISK log end ------------" >> $LOGFILE
-# end patch
+    # end patch
     [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
     [ "$res" = "" ] && res="-1"
@@ -2422 +2263 @@
 
     for real_dev in `GetRaidDevMembers $1` ; do
-    tmp=`SizeOfPartition $real_dev`
-    [ "$tmp" -lt "$smallest_size" ] && smallest_size=$tmp
+        tmp=`SizeOfPartition $real_dev`
+        [ "$tmp" -lt "$smallest_size" ] && smallest_size=$tmp
     done
 
     if [ "$smallest_size" = "$silly" ] ; then
-    echo "-1"
-    return 1
-    else
-    echo "$smallest_size"
-    return 0
-    fi
-}
-
-
-
-
+        echo "-1"
+        return 1
+    else
+        echo "$smallest_size"
+        return 0
+    fi
+}
 
 
@@ -2443 +2280 @@
 {
     local tempfile
-    tempfile=$TMP_ROOT/$$.strip.txt
+
+    tempfile=$MONDOTMP/$$.strip.txt
     cp -f $1 $tempfile
     $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
@@ -2451 +2289 @@
 
 
-
-
-
-
 SplitDirectoryIntoMinidirs() {
     local bigdir minidir_root i noof_disks old_pwd res
+
     bigdir=$1
     minidir_root=$2
@@ -2464 +2299 @@
     noof_disks=$?
     if [ "$noof_disks" -eq "0" ] ; then
-    echo "Failed to fit data into several dirs."
+        echo "Failed to fit data into several dirs."
         return 0
     fi
     RejigHyperlinks $minidir_root $noof_disks
     rm -Rf $bigdir/*
-   return $noof_disks
-}
-
+    return $noof_disks
+}
 
 
@@ -2477 +2311 @@
 {
     local tmpfile
-    tmpfile=$TMP_ROOT/stripped.$$.dat
+
+    tmpfile=$MONDOTMP/stripped.$$.dat
     [ -d "$1" ] || [ -h "$1" ] && return
     cp -f $1 $tmpfile
     strip $tmpfile 2> /dev/null
     if [ "$?" -eq "0" ] ; then
-    cp -f $tmpfile $1
-    echo "Stripped binary $2" >> $LOGFILE
+        cp -f $tmpfile $1
+        echo "Stripped binary $2" >> $LOGFILE
     fi
     rm -f $tmpfile
@@ -2508 +2343 @@
 
 
-
 TryToFindKernelPath() {
     local fname incoming res fkern_ver we_want_version possible_kernels noof_kernels kernelpath kdate duff_kernels
+
     we_want_version=`uname -r`
     possible_kernels=""
@@ -2521 +2356 @@
     fi
     for fname in `find $root -maxdepth 2 -type f | grep -F lin | grep -Ev '^/proc/|^/net/'` ; do
-    [ ! -e "$fname" ] && continue
+        [ ! -e "$fname" ] && continue
         [ "$fname" = "/boot/vmlinuz.shipped" ] && [ -f "/boot/vmlinuz" ] && continue; # ignore SuSE's extra kernel
-    file $fname | grep -q gzip
-    if [ "$?" -eq "0" ] ; then
-        # Used by ia64
+        file $fname | grep -q gzip
+        if [ "$?" -eq "0" ] ; then
+            # Used by ia64
             fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
-    else
+        else
             fkern_ver=`strings $fname 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
-    fi
+        fi
         [ "$fkern_ver" = "" ] && continue
-#   echo "$fname --> $fkern_ver (but we want $we_want_version)" >> /dev/stderr
         [ "`echo "$fkern_ver" |grep -F "$we_want_version "`" = "" ] && continue
-    [ -f "$fname" ] || continue
-    [ -h "$fname" ] && continue
-    kdate=`uname -v | $AWK '{for(i=1;i<NF;i++){if(index($i,":")){print $i;};};}' | $AWK '{print $NF;}'`
-    file $fname | grep -q gzip
-    if [ "$?" -eq "0" ] ; then
-        # Used by ia64
-        if [ "`gzip -cd $fname | strings 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
-            LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it...\n"
-            duff_kernels="$fname $duff_kernels"
-        else
+        [ -f "$fname" ] || continue
+        [ -h "$fname" ] && continue
+        kdate=`uname -v | $AWK '{for(i=1;i<NF;i++){if(index($i,":")){print $i;};};}' | $AWK '{print $NF;}'`
+        file $fname | grep -q gzip
+        if [ "$?" -eq "0" ] ; then
+            # Used by ia64
+            if [ "`gzip -cd $fname | strings 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
+                LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it...\n"
+                duff_kernels="$fname $duff_kernels"
+            else
                 [ "`echo "$fname" | grep -F "vmlinux"`" ] && continue
                 possible_kernels="$fname $possible_kernels"
-        fi
-    else
-        if [ "`strings $fname 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
-            LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it...\n"
-            duff_kernels="$fname $duff_kernels"
+            fi
         else
+            if [ "`strings $fname 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
+                LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it...\n"
+                duff_kernels="$fname $duff_kernels"
+            else
                 [ "`echo "$fname" | grep -F "vmlinux"`" ] && continue
                 possible_kernels="$fname $possible_kernels"
-        fi
-    fi
+            fi
+        fi
     done
     if [ ! "$possible_kernels" ] && uname -a | grep Knoppix > /dev/null ; then
-    possible_kernels=`find /boot/vmlinuz-2.* | tail -n1`
+        possible_kernels=`find /boot/vmlinuz-2.* | tail -n1`
     fi
     if [ ! "$possible_kernels" ] ; then
@@ -2573 +2407 @@
     if [ "$noof_kernels" -eq "0" ] ; then
         LogIt "Could not find your kernel.\n"
-    if [ -e "/boot/vmlinuz" ] ; then
-        LogIt "Using /boot/vmlinuz as a last resort.\n"
-        output=/boot/vmlinuz
+        if [ -e "/boot/vmlinuz" ] ; then
+            LogIt "Using /boot/vmlinuz as a last resort.\n"
+            output=/boot/vmlinuz
         else
-        output=""
-    fi
+            output=""
+        fi
     elif [ "$noof_kernels" -eq "1" ] ; then
         kernelpath=`echo "$possible_kernels" | sed s/' '//`
@@ -2586 +2420 @@
         for i in $possible_kernels ; do
             if echo $i | grep "`uname -r`" ; then
-        LogIt "OK, I used my initiative and found that "
+                LogIt "OK, I used my initiative and found that "
                 LogIt "$i is probably your kernel.\n "
-        output="$i"
-        return
-        fi
+                output="$i"
+                return
+            fi
         done
-    if echo " $possible_kernels " | grep -F "/boot/vmlinuz " &> /dev/null ; then
-        output=/boot/vmlinuz
-        echo "Schlomo, this one's for you." >> $LOGFILE
-    else
+        if echo " $possible_kernels " | grep -F "/boot/vmlinuz " &> /dev/null ; then
+            output=/boot/vmlinuz
+            echo "Schlomo, this one's for you." >> $LOGFILE
+        else
             LogIt "Two or more possible kernels found. You may specify any one of them and the \n"
-        LogIt "boot disks will still work, probably. If one does not work, try another.\n"
+            LogIt "boot disks will still work, probably. If one does not work, try another.\n"
             LogIt "$possible_kernels\n"
             echo ""
-    fi
+        fi
     fi
     echo "$output" | tr -s ' ' '\n' | sort -u | tr '\n' ' '
 }
-
-
-
 
 
@@ -2612 +2443 @@
     local bigdir minidir_root noof_disks diskno list_of_files filename old_pwd progress
     local i retval noof_disks total_files list_of_devs
+
     bigdir=$1
     minidir_root=$2
@@ -2635 +2467 @@
     for filename in $list_of_files ; do
         AddFileToDir $filename $minidir_root $noof_disks
-    i=$?
-    if [ "$i" -gt "$noof_disks" ] ; then
-        noof_disks=$i
-        echo -en "\r\t\t\t\t\t\t($noof_disks disks)"
-    fi
-    if [ "$i" -eq "0" ] ; then
-        LogIt "Cannot add file $filename to minidir $minidir_root\n"
-        retval=$(($retval+1))
-    fi
+        i=$?
+        if [ "$i" -gt "$noof_disks" ] ; then
+            noof_disks=$i
+            echo -en "\r\t\t\t\t\t\t($noof_disks disks)"
+        fi
+        if [ "$i" -eq "0" ] ; then
+            LogIt "Cannot add file $filename to minidir $minidir_root\n"
+            retval=$(($retval+1))
+        fi
         progress=$(($progress+1))
-    echo -en "\r\t\t\t\t\t\t\t\t$(($progress*100/$total_files))% complete\r"
+        echo -en "\r\t\t\t\t\t\t\t\t$(($progress*100/$total_files))% complete\r"
     done
     cd $old_pwd
@@ -2651 +2483 @@
     rm -Rf $minidir_root/compressed
     if [ "$retval" -gt "0" ] ; then
-    return 0
-    else
-    return $noof_disks
-    fi
-}
-
+        return 0
+    else
+        return $noof_disks
+    fi
+}
 
 
 TurnTgzIntoRdz() {
     local tgz_dir_fname rdz_fname ramdisksize tempfile mountpoint old_pwd nodes disksize kernelsize maxsize res currsize not_copied j k floppy_modules s w
+
     tgz_dir_fname=$1
     rdz_fname=$2
@@ -2668 +2500 @@
     maxsize=$(($disksize-$kernelsize))
     maxsize=$(($maxsize*2)); # to allow for compression of 50%
-    tempfile=$TMP_ROOT/temp.rd
-    mountpoint=$TMP_ROOT/mnt1
+    tempfile=$MONDOTMP/temp.rd
+    mountpoint=$MONDOTMP/mnt1
     res=0
     echo -en "..."
@@ -2676 +2508 @@
     mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE
 
-    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
-    rm -f /tmp/mke2fs.$$
+    [ "$?" -ne "0" ] && cat $MONDOTMP/mke2fs.log
+    rm -f $MONDOTMP/mke2fs.log
     echo -en "..."
     mkdir -p $mountpoint
@@ -2684 +2516 @@
     old_pwd=`pwd`
     cd $mountpoint
-#    [ -e "$MINDI_LIB/memtest.img" ] && echo "Yep, this is a multi-function CD" > MULTIFUNC
     cp -Rdf $tgz_dir_fname/* . 2>> $LOGFILE >> $LOGFILE
     tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
@@ -2692 +2523 @@
     cd ..
 
-# add insmod.static and insmod.static.old if (a) they exist and (b) this is a 64-bit distro
-#    if [ "`uname -a | grep x86`" ] || [ "`uname -a | grep amd64`" ] ; then
-
     for w in insmod.static insmod.static.old ; do
-    s=`which $w 2> /dev/null`
-    if [ -e "$s" ] ; then
-        cp --parents -af $s .
-#       LogIt "Copying $s to initrd"
-    fi
-    done
-
-#    fi
+        s=`which $w 2> /dev/null`
+        if [ -e "$s" ] ; then
+            cp --parents -af $s .
+        fi
+    done
 
     mkdir -p tmp
@@ -2710 +2535 @@
         mkdir -p mnt/$w
     done
-    if [ "$RUN_AFTER_INITIAL_BOOT_PHASE" ] ; then
-    ReplaceIndividualLine sbin/init `grep -n "#WHOLIVESINAPINEAPPLEUNDERTHESEA#" sbin/init | cut -d':' -f1` "$RUN_AFTER_INITIAL_BOOT_PHASE"
-    fi
+    #if [ "$RUN_AFTER_INITIAL_BOOT_PHASE" ] ; then
+        #ReplaceIndividualLine sbin/init `grep -n "#WHOLIVESINAPINEAPPLEUNDERTHESEA#" sbin/init | cut -d':' -f1` "$RUN_AFTER_INITIAL_BOOT_PHASE"
+    #fi
     if [ "$RUN_AFTER_BOOT_PHASE_COMPLETE" ] ; then
-    ReplaceIndividualLine sbin/init `grep -n "#ABSORBENTANDYELLOWANDPOROUSISHE#" sbin/init | cut -d':' -f1` "$RUN_AFTER_BOOT_PHASE_COMPLETE"
+        ReplaceIndividualLine sbin/init `grep -n "#ABSORBENTANDYELLOWANDPOROUSISHE#" sbin/init | cut -d':' -f1` "$RUN_AFTER_BOOT_PHASE_COMPLETE"
     fi
 
@@ -2726 +2551 @@
     old_pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-        cd $TMP_ROOT
+        cd $MONDOTMP
         floppy_modules_path=lib/modules/$FAILSAFE_KVER
     else
@@ -2750 +2575 @@
         list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     fi
-    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
+    if [ -e "$MONDOTMP/NFS-DEV" ] ; then
         # For PXE boot
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
@@ -2760 +2585 @@
     for i in $floppy_modules ; do
         [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
-        [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
+        [ "$YOUR_KERNEL_SUCKS" ] && i=$MONDOTMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
         cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
         [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     done
-#    if [ -e "/dev/.devfsd" ] ; then
-#   echo "Copying devfs stuff to ramdisk" >> $LOGFILE
-#   for i in /dev /etc/devfsd.conf /etc/modules.devfs /lib/dev-state ; do
-#       cp --parents -pRdf $i $mountpoint/ 2>> $LOGFILE
-#   done
-#    fi
     if [ ! -e "/sbin/devfsd" ] || [ "$disksize" -lt "2880" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
         echo "Deleting devfsd daemon from ramdisk" >> $LOGFILE
@@ -2776 +2595 @@
         [ "$disksize" -lt "2880" ] && echo "...because disksize = $disksize" >> $LOGFILE
         [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] && echo "...because kernel is failsafe" >> $LOGFILE
-#        ls -l $mountpoint/sbin/devfsd &> /dev/null || Die "Can't find devfsd daemon on ramdisk"
         rm -f $mountpoint/sbin/devfsd
     fi
@@ -2785 +2603 @@
     if [ "`DidMondoCallMe`" ] ; then
         MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
-        cp -f $mountpoint/tmp/mondo-restore.cfg $MONDO_TMP &> /dev/null
-        cp -f $TMP_ROOT/mountlist.txt $mountpoint/tmp/ || Die "Cannot copy mountlist to ramdisk"
+        cp -f $mountpoint/tmp/mondo-restore.cfg $MONDOTMP &> /dev/null
+        cp -f $MONDOTMP/mountlist.txt $mountpoint/tmp/ || 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
@@ -2810 +2628 @@
 
 
-
 WhichOfTheseModulesAreLoaded() {
     local modname loaded_modules
     loaded_modules=" `lsmod | tr -s ' ' '\t' | cut -f1 | grep -Fvx "Modules" | tr '\n' ' '` "
     for modname in $1 ; do
-    [ "`echo "$loaded_modules" | grep -F " $modname "`" ] && echo "$modname"
-    done
-}
-
-
+        [ "`echo "$loaded_modules" | grep -F " $modname "`" ] && echo "$modname"
+    done
+}
 
 
@@ -2838 +2653 @@
         diskno=$(($diskno+1))
         echo -n "..."
-    cp -pRdf * $minidir_root/all
+        cp -pRdf * $minidir_root/all
     done
     mkdir -p $minidir_root/all/tmp
@@ -2845 +2660 @@
     if [ "`DidMondoCallMe`" ] ; then
         for q in filelist.full.gz biggielist.txt ; do
-            [ ! -e "$MONDO_TMP/$q" ] && Die "Cannot find $MONDO_TMP/$q"
-            cp -pRdf $MONDO_TMP/$q tmp/
+            [ ! -e "$MONDOTMP/$q" ] && Die "Cannot find $MONDOTMP/$q"
+            cp -pRdf $MONDOTMP/$q tmp/
         done
         mkdir -p $minidir_root/all/tmp
@@ -2861 +2676 @@
 
 
-
-# BERLIOS: This function is wrong
-# Should be recoded. Desactivated in between
-
-#ListUnsavedKernelModules() {
-    #local fname modules
-    #fname=/tmp/$RANDOM.$$.$RANDOM
-    #lsmod | sed -n '2,$s/ .*//p' > $fname
-    #modules=`sort $fname | uniq -d2 | tr '\n' ' '`
-    #rm -f $fname
-    #[ "$modules" ] && echo "Unsaved kernel modules: $modules" >> $LOGFILE
-#}
-
-
-
-
-
 ##############################################################################
 #----------------------------------- main -----------------------------------#
 ##############################################################################
 
-
-if [ "$1" = "-V" ] || [ "$1" = "-v" ] || [ "$1" = "--version" ] || [ "$1" = "-version" ] ; then
-    echo "mindi v$MINDI_VERSION"
-    exit 0
-fi
 
 if [ "$1" = "-printvar" ] ; then
@@ -2921 +2714 @@
 # modprobe.conf file is created in MakeModuleLoadingScript. AL041128.
 if [ -d "/etc/modprobe.d" ] && [ `uname -r | cut -c1-3` == "2.6" ] ; then
-  TMPMODPROBE_FLAG="Y"
+    TMPMODPROBE_FLAG="Y"
 else
     TMPMODPROBE_FLAG="N"
@@ -2930 +2723 @@
 [ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
 AbortIfMkfsVfatMissing
-### BCO
+### BERLIOS
 ### Fix as it's not mandatory on ia64
 if [ "$ARCH" = "ia64" ] ; then
@@ -2938 +2731 @@
     FindLiloBinary
 fi
-grep -F " $TMP_ROOT " /proc/mounts | grep -F tmpfs > /dev/null 2> /dev/null && TMP_ROOT=/home && LogIt "Changing TMP_ROOT to $TMP_ROOT because you're using tmpfs for /tmp\n" ; # tmpfs doesn't like Mindi and /tmp, for some reason
-rm -f /tmp/mindi_lo
+# 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
 trap "Aborted" SIGTERM
 DONE="\r\t\t\t\t\t\t\t\tDone.         "
@@ -2945 +2738 @@
 BIGNO=0
 MAX_COMPRESSED_SIZE=1300
-imagesdir=$CACHEDIR
 kernelpath=""
-MONDO_ROOT=/tmp/mindilinux/mondo-root
+MONDO_ROOT=$TMPMONDO/mondo-root
 mkdir -p $MONDO_ROOT
 
@@ -2980 +2772 @@
     if [ "$1" = "--findkernel" ] ; then
         res=`TryToFindKernelPath`
-#    2> /dev/null`
         if [ "$res" = "" ] ; then
-            exit 1
+            MindiExit -1
         else
             echo "$res"
-            exit 0
+            MindiExit 0
         fi
     elif [ "$1" = "--makemountlist" ] ; then
         [ ! "$2" ] && Die "Please specify the output file"
         MakeMountlist $2
-        exit $?
-    elif [ "$1" = " --version" ] || [ "$1" = "-v" ] ; then
+        MindiExit $?
+    elif [ "$1" = "-V" ] || [ "$1" = "-v" ] || [ "$1" = "--version" ] || [ "$1" = "-version" ] ; then
         echo "Mindi v$MINDI_VERSION"
-        exit 0
+        MindiExit 0
     elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
-        TMP_ROOT=$2
-        MONDO_TMP=$2
-        imagesdir=$3
+        MONDOTMP=$2
+        BIDON=$3
         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
 ###
@@ -3030 +2820 @@
         if [ "${11}" ] ; then
             LILO_OPTIONS=""
-#       LogIt "LILO will use conservative settings, to be compatible with older BIOSes."
+    #       LogIt "LILO will use conservative settings, to be compatible with older BIOSes."
         fi
         LAST_FILELIST_NUMBER=${12}
@@ -3055 +2845 @@
         fi
         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
-        MONDO_ROOT=`echo $imagesdir | sed 's/\(.*\)\/.*/\1/'`
+        MONDO_ROOT=`echo $CACHEDIR | sed 's/\(.*\)\/.*/\1/'`
         [ "$MONDO_ROOT" = "" ] && Die "MONDO_ROOT is undefined"
     else
         echo "Syntax: mindi (--custom ....)" >> /dev/stderr
-        exit 1
+        MindiExit -1
     fi
 fi
@@ -3074 +2864 @@
 
 [ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
-rm -Rf $TMP_ROOT/mindilinux/*
-TMP_ROOT=$TMP_ROOT/mindilinux/$$
-mkdir -p $TMP_ROOT
 if [ ! "`DidMondoCallMe`" ] ; then
     LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION\n"
@@ -3099 +2886 @@
 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 $MONDO_TMP/mondo-restore.cfg
-    MakeMountlist $MONDO_TMP/mountlist.txt
-    mkdir -p $MONDO_TMP/small-all/tmp
-    cd $MONDO_TMP/small-all
-    cp -f $MONDO_TMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp || Die "Cannot copy small all.tar.gz"
-    tar -cv tmp | gzip -9 > $MONDO_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
+    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"
     sleep 2
     LogIt "Done. Exiting.\n"
-    exit 0
+    MindiExit 0
 fi
 
@@ -3145 +2932 @@
     LogIt "disks then it may still be a result of a problem with your kernel.\n"
     pwd=`pwd`
-    cd $TMP_ROOT
+    cd $MONDOTMP
     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 = $TMP_ROOT \nMindi's output dir=$imagesdir" >> $LOGFILE
+echo -e "Mindi's temp dir = $MONDOTMP \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"
-rm -f /tmp/mindi.err.*.tgz
 
 [ "$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."
@@ -3158 +2944 @@
 rm -f $CACHEDIR/{*img,*gz,*iso}
 
-rm -f $imagesdir/mindi-*.img $imagesdir/[0-9]*.tar.gz $imagesdir/mindi.iso
-needlist=$TMP_ROOT/what-we-need.txt
-bigdir=$TMP_ROOT/bigdir
-minidir_root=$TMP_ROOT/minidir
-mkdir -p $minidir_root
-mkdir -p $bigdir/usr/bin
-tardir=$TMP_ROOT/tardir
-
-lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt $DEPLIST_DIR/* | grep -vx "" | wc -l`
-cat $MINDI_CONF/deplist.txt $DEPLIST_DIR/* | GenerateGiantDependencyList $needlist $lines
-res=$?
-if [ "$YOUR_KERNEL_SUCKS" ]; then
-    pwd=`pwd`
-    cd $TMP_ROOT
-    for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-        cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
-        if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
-            cp --parents -pRdf $i $bigdir
-        else
-            ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
-            BIGNO=$(($BIGNO+1))
-        fi
-    done
-    for i in $EXTRA_MODS ; do
-        j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
-        [ ! "$j" ] && echo "Warning - cannot find failsafe module $i.o" >> $LOGFILE
-        for k in $j ; do
-            if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-                    cp --parents -pRdf $k $bigdir
-        else
-                ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
-                BIGNO=$(($BIGNO+1))
-            fi
-            echo "Added failsafe module $k to ramdisk" >> $LOGFILE
-        done
-    done
-    cd $pwd
-else
-    ListKernelModulePaths >> $needlist
-fi
-if [ "$res" -ne "0" ] ; then
-    Die "You have $res file`PluralOrNot $res` present in dependency list\nbut absent from filesystem."
-fi
-FindAndAddUserKeyboardMappingFile
-mkdir -p $bigdir/tmp
-if [ "`DidMondoCallMe`" ] ; then
-    MakeMondoConfigFile $TMP_ROOT/mondo-restore.cfg
-    cp -f $TMP_ROOT/mondo-restore.cfg $bigdir/tmp &> /dev/null
-    cp -f $TMP_ROOT/mondo-restore.cfg $CACHEDIR &> /dev/null
-fi
-[ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
-DropOptimizedLibraries $needlist $bigdir
-echo -en "Assembling dependency files"
-CopyDependenciesToDirectory < $needlist $bigdir
-
-# also copy io.sys and msdos.sys, if we can find them
-for i in `mount | cut -d' ' -f3` ; do
-    for j in io.sys msdos.sys ; do
-        [ -e "$i/$j" ] && cp -f $i/$j $bigdir
-    done
-done
-
-# master boot record, too
-i=`cat $MONDO_TMP/BOOTLOADER.DEVICE 2> /dev/null`
-if [ "$i" ] ; then
-    LogIt "Backing up $i's MBR\n"
-    dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
-# < < E O F
-    sleep 1
-    sync
-#        [ "$?" -ne "0" ] && echo "Failed to save $i's MBR to bigdir" >> $LOGFILE
-    j=$i
-    [ -h "$j" ] && j=`ResolveSoftlink $j`
-    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"
-fi
-
-# more stuff
-#    cp -f $MINDI_LIB/embleer* $bigdir
-old_pwd=`pwd`
-cd $bigdir
-
-[ -e "$MINDI_LIB/aux-tools" ] || Die "aux-tools not found in Mindi's home dir. Do you have multiple copies of Mindi lying around? Please delete them. No, don't e-mail me and ask how. ;) Use 'rm'."
-cp -Rdf $MINDI_LIB/aux-tools/* . 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping aux-tools\n"
-if [ -e "$MINDI_LIB/x11-tools.tgz" ] ; then
-    tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
-fi
-if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
-    cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
-    [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
-fi
-[ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .
-cd $old_pwd
-echo -e "$DONE"
-TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
-SplitDirectoryIntoMinidirs $bigdir $minidir_root
+PrepareDataDiskImages $CACHEDIR
 noof_disks=$?
 [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
@@ -3266 +2956 @@
 cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
 ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
-CreateDataDiskImagesFromTarballs $tardir $imagesdir $noof_disks
+CreateDataDiskImagesFromTarballs $tardir $CACHEDIR $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
@@ -3280 +2970 @@
 if [ "$USE_LILO" = "yes" ] ; then
     if [ "$ARCH" = "ia64" ] ; then
-        PrepareBootDiskImage_LILO $imagesdir $IA64_BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
-    else
-        if ! PrepareBootDiskImage_LILO $imagesdir 1722 $kernelpath $ramdisk_size ; then
+        PrepareBootDiskImage_LILO $CACHE_LOC $IA64_BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
+    else
+        if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
             LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
             LogIt "if you want to make a 1.72MB floppy disk.\n"
         fi
-        if ! PrepareBootDiskImage_LILO $imagesdir 2880 $kernelpath $ramdisk_size ;  then
+        if ! PrepareBootDiskImage_LILO $CACHE_LOC 2880 $kernelpath $ramdisk_size ;  then
             LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
             LogIt "Please reduce your kernel's size\n"
             LogIt "if you want to make a 2.88MB floppy disk.\n"
-            PrepareBootDiskImage_LILO $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
+            PrepareBootDiskImage_LILO $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
         fi
     fi
 else
-    if ! PrepareBootDiskImage_SYSLINUX $imagesdir 1722 $kernelpath $ramdisk_size ; then
+    if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
         LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
         LogIt "if you want to make a 1.72MB floppy disk.\n"
-        if ! PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size ; then
+        if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
             LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
             LogIt "Please reduce your kernel's size\n"
             LogIt "if you want to make a 2.88MB floppy disk.\n"
-            PrepareBootDiskImage_SYSLINUX $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+            PrepareBootDiskImage_SYSLINUX $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
         fi
     fi
 fi
-
-
 
 [ -e "$MINDI_LIB/memtest.img" ] && BOOT_MEDIA_MESSAGE="$BOOT_MEDIA_MESSAGE\n\
 ...Or type 'memtest' to test your PC's RAM thoroughly.\n"
 
-
 if [ ! "`DidMondoCallMe`" ] ; then
-    ListImagesForUser $imagesdir
+    ListImagesForUser $CACHE_LOC
     boot_dev=/dev/fd0u1722
     [ ! -e "$boot_dev" ] && mknod $boot_dev b 2 60
@@ -3319 +3006 @@
     [ ! -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
-        echo -en "Would you like to create boot+data floppy disks now (y/n) ?"
-        read i
-        [ "$i" != "y" ] && [ "$i" != "Y" ] && return
-        mount | fgrep /dev/fd > /dev/null && Die "Please unmount your floppies first."
-        echo "WARNING! THIS WILL ERASE YOUR FLOPPY DISKS."
-        [ ! -e "$boot_dev" ] && Die "Cannot find $boot_dev - is your Linux distro broken?"
-        [ ! -e "$FDDEVICE" ] && Die "Cannot find $FDDEVICE - is your Linux distro broken?"
-        i=`find $imagesdir -type f | fgrep "/mindi-root.1" 2> /dev/null`
-        j=`find $imagesdir -type f | fgrep "/mindi-boot" | egrep -v '2880|5760'`
-        if [ "$i" ] ; then
-            CopyImageToDisk $j $FDDEVICE "boot disk"
-            CopyImageToDisk $i $FDDEVICE "root disk"
-        else
-            CopyImageToDisk $j $boot_dev "boot/root disk"
-        fi
-        count=1
-        for i in `find $imagesdir | fgrep mindi-data` ; do
-            CopyImageToDisk $i $FDDEVICE "data disk #$count"
-            count=$(($count+1))
-        done
-    fi
-    OfferToMakeBootableISO $imagesdir
+        OfferToCopyImagesToDisks $CACHEDIR $boot_dev $FDDEVICE
+    fi
+    OfferToMakeBootableISO $CACHE_LOC
     LogIt "Finished.\n"
 elif [ "$TAPEDEV" ] ; then
     rm -f $CACHEDIR/{*img,*gz,*iso}
-    OfferToMakeBootableISO $imagesdir
-    if [ -e "$imagesdir/all.tar.gz" ] ; then
-        cp -f $imagesdir/all.tar.gz $MONDO_TMP/
-    else
-    Die "Cannot find all.tar.gz, to be written to tape"
+    OfferToMakeBootableISO $CACHE_LOC
+    if [ -e "$CACHE_LOC/all.tar.gz" ] ; then
+        cp -f $CACHE_LOC/all.tar.gz $MONDOTMP/
+    else
+        Die "Cannot find all.tar.gz, to be written to tape"
     fi
 else
-    OfferToMakeBootableISO $imagesdir
+    OfferToMakeBootableISO $CACHE_LOC
 fi
-[ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
 # cleanup
-rm -f /tmp/mountlist.txt.$$ $FDISKLOG /tmp/mindilinux
+rm -Rf $MONDOTMP $FDISKLOG
 LogIt "$FRIENDLY_OUTSTRING\n"
-#ListUnsavedKernelModules
 for mtpt in $FLOPPY_WAS_MOUNTED ; do
     mount $mtpt
 done
-echo "Mindi is exiting" >> $LOGFILE
-echo "End date : `date`" >> $LOGFILE
-exit 0
+MindiExit 0