Changeset 2462 in MondoRescue

Timestamp:

Oct 20, 2009, 4:07:00 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3548@localhost: bruno | 2009-10-16 19:18:27 +0200

• mindi now boots in a QEMU VM without busybox
• mindi is now noarch as a consequence
• MINDI_LIB becomes MINDI_DATA for coherency and as a consequence
• CACHEDIR becomes MINDI_CACHE for coherency and it's a build parameter and not hardcoded anymore in mindi
• THat variable is also used at restore time for mondorestore.cfg e.g.
• FAILSAFE kernel is gone. Just use another kernel of your choice. Most std kernels work anyway
• TurnTgzIntoRdz rewritten and now really computes data disk size and not suppose its size
• Interface mondo/mindi changed again => incompatible
• Non-bootable media not supported anymore.
• Mondorescue adapted to these changes but not tested yet
• Doc updated as well

Location:

branches/2.2.10

Files:

• mindi/deplist.d/minimal.conf (modified) (2 diffs)
• mindi/install.sh (modified) (4 diffs)
• mindi/mindi (modified) (44 diffs)
• mindi/mindi-bkphw (modified) (1 diff)
• mindi/rootfs/sbin/find-and-mount-cdrom (modified) (2 diffs)
• mindi/rootfs/sbin/hack-cfg-if-necessary (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (18 diffs)
• mindi/rootfs/sbin/post-init (modified) (4 diffs)
• mindi/rootfs/sbin/start-netfs (modified) (1 diff)
• mindi/rootfs/sbin/start-usb (modified) (1 diff)
• mondo-doc/mondoarchive.8 (modified) (1 diff)
• mondo-doc/mondorescue-howto.sgml (modified) (7 diffs)
• mondo/src/common/libmondo-archive.c (modified) (3 diffs)
• mondo/src/common/libmondo-cli.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (2 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (2 diffs)
• mondo/src/common/libmondo-files.c (modified) (4 diffs)
• mondo/src/common/libmondo-stream.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (2 diffs)
• mondo/src/common/mondostructures.h (modified) (1 diff)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (2 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (9 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (7 diffs)
• mondo/src/restore-scripts/mondo/format-and-kludge-vfat (modified) (1 diff)
• mondo/src/restore-scripts/mondo/grub-MR (modified) (1 diff)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)
• mondo/src/restore-scripts/mondo/mount-me (modified) (1 diff)
• mondo/src/restore-scripts/mondo/stabelilo-me (modified) (2 diffs)
• mondo/src/restore-scripts/mondo/stabgrub-me (modified) (1 diff)
• mondo/src/restore-scripts/mondo/stablilo-me (modified) (2 diffs)
• mondo/src/restore-scripts/mondo/stabraw-me (modified) (1 diff)
• mondo/src/restore-scripts/mondo/unmount-me (modified) (1 diff)
• mondo/test/test-mountlist.c (modified) (1 diff)

branches/2.2.10/mindi/deplist.d/minimal.conf

@@ -19 +19 @@
 /sbin/reboot
 /sbin/openvt
+/usr/bin/openvt
 /usr/bin/tail
 /usr/bin/which
@@ -27 +28 @@
 /usr/bin/cut
 /usr/bin/basename
+/bin/basename
 /usr/bin/find
 /bin/stty
 /bin/echo
+/bin/chown
 /bin/mknod
 /bin/kill

branches/2.2.10/mindi/install.sh

@@ -43 +43 @@
 echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
 
-if [ _"$CACHEDIR" = _"" ]; then
-    CACHEDIR=$local/var/cache/mindi
+if [ _"$MINDI_CACHE" = _"" ]; then
+    localcache=$local/var/cache/mindi
 else
-    CACHEDIR=${HEAD}$CACHEDIR
+    localcache=${HEAD}$MINDI_CACHE
 fi
 if [ _"$MANDIR" = _"" ]; then
@@ -58 +58 @@
     DOCDIR=${HEAD}$DOCDIR/mindi-$MINDIVER
 fi
-if [ _"$LIBDIR" = _"" ]; then
-    echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
-    echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
-    echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
-    sublocallib="$locallib/mindi"
+if [ _"$DATADIR" = _"" ]; then
+    localdata="$local/share"
+    sublocaldata="$localdata/mindi"
 else
-    locallib=${HEAD}$LIBDIR
-    sublocallib="$LIBDIR/mindi"
+    localdata=${HEAD}$DATADIR
+    sublocaldata="$DATADIR/mindi"
 fi
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR $conf/deplist.d
+install -m 755 -d $conf $localdata/mindi $MANDIR $local/sbin $localcache $conf/deplist.d
 
 echo "Copying files ..."
-cp -af rootfs $locallib/mindi
-chmod 755 $locallib/mindi/rootfs/sbin/*
-install -m 755 analyze-my-lvm $locallib/mindi
-install -m 644 msg-txt dev.tgz $locallib/mindi
+cp -af rootfs $localdata/mindi
+chmod 755 $localdata/mindi/rootfs/sbin/*
+install -m 755 analyze-my-lvm $localdata/mindi
+install -m 644 msg-txt dev.tgz $localdata/mindi
 install -m 644 deplist.conf deplist-minimal.conf udev.files proliant.files mindi.conf $conf
 for f in deplist.d/*.conf; do
@@ -85 +83 @@
 
 # Substitute variables for mindi
-sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" mindi > $local/sbin/mindi
+sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_DATA=LLL~MINDI_DATA=$sublocaldata~" -e "s~^MINDI_CACHE=CCC~MINDI_CACHE=$MINDI_CACHE~" mindi > $local/sbin/mindi
+sed -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^export MINDI_CACHE=CCC~export MINDI_CACHE=$MINDI_CACHE~" rootfs/sbin/init > $localdata/mindi/rootfs/sbin/init
 chmod 755 $local/sbin/mindi $local/sbin/mindi-bkphw
 
@@ -94 +93 @@
 if [ "$ARCH" = "ia64" ] ; then
     (cd $local/sbin && ln -sf parted2fdisk.pl parted2fdisk)
-    install -s -m 755 $local/sbin/parted2fdisk.pl $locallib/mindi/rootfs/sbin/parted2fdisk
+    install -s -m 755 $local/sbin/parted2fdisk.pl $localdata/mindi/rootfs/sbin/parted2fdisk
 else
     # FHS requires fdisk under /sbin
     (cd $local/sbin && ln -sf /sbin/fdisk parted2fdisk)
     echo "Symlinking fdisk to parted2fdisk"
-    ( cd $locallib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
+    ( cd $localdata/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
 fi
 
 if [ "$PKGBUILDMINDI" != "true" ]; then
-    chown -R root:root $locallib/mindi $conf # $DOCDIR
-    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl 
+    chown -R root:root $localdata/mindi $conf # $DOCDIR
+    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $localdata/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl 
     if [ "$ARCH" = "ia64" ] ; then
         chown root:root $local/sbin/parted2fdisk

branches/2.2.10/mindi/mindi

@@ -29 +29 @@
 MINDI_CONF=YYY
 MINDI_SBIN=${MINDI_PREFIX}/sbin
-MINDI_LIB=LLL
+MINDI_DATA=LLL
+MINDI_CACHE=CCC
 
 # Temporary directory for mindi
 TMPDIR=/tmp
 
-EXTRA_SPACE=60000       # increase if you run out of ramdisk space
+EXTRA_SPACE=50000       # increase if you run out of ramdisk space
 BOOT_SIZE=24576         # size of the boot disk
 
@@ -58 +59 @@
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless"
-NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 bnx2x e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet exportfs fuse libcrc32c"
+NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 bnx2x e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet exportfs fuse libcrc32c crc32c"
 CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660"
 # Those modules will only go on the backup media, not the boot media.
@@ -69 +70 @@
 
 LOGFILE=/var/log/mindi.log
-MINDI_CACHE=/var/cache/mindi
 BOOT_MEDIA_MESSAGE="\
 To format and restore all files automatically, type 'nuke' <enter>.\n\
@@ -250 +250 @@
 
     # Unmount what could remain mounted
-    my_partitions=`mount | grep -F $$ | cut -f1 -d' '`
+    my_partitions=`mount | grep -F $MINDI_TMP | cut -f1 -d' '`
     [ "$my_partitions" != "" ] && umount $my_partitions
     # Clean temporary files only when standalone mindi
@@ -433 +433 @@
 
 FindSpecificModuleInPath() {
-    local modpaths pwd line
-    pwd=`pwd`
-    if [ "$YOUR_KERNEL_SUCKS" ] ; then
-        cd $MINDI_TMP
-    else
-        cd /
-    fi
+    local modpaths line
+
     if [ ! -e "$1" ] ; then
         LogAll "WARNING - cannot search specific path '$1'"
@@ -445 +440 @@
     fi
     modpaths=`find $1 -name $2.*o -type f`
-    #[ "$?" -ne "0" ] && Die "find $1 -name $2.o -type f --- failed"
     [ "$modpaths" = "" ] && modpaths=`find $1 -name $2.o.gz -type f`
     [ "$modpaths" = "" ] && modpaths=`find $1 -name $2.ko.gz -type f`
     [ "$modpaths" = "" ] && modpaths=`find $1 -name $2 -type f`
     echo "$modpaths"
-    cd $pwd
 }
 
@@ -694 +687 @@
 
 
-HackPathsToFailsafe() {
-    local incoming newpath stub i pwd
-    incoming=`ReadLine`
-    pwd=`pwd`
-    cd $MINDI_TMP
-    while [ "$incoming" != "" ] ; do
-        stub=`basename $incoming`
-        newpath=`FindSpecificModuleInPath lib/modules/$FAILSAFE_KVER $stub`
-        for i in $newpath ; do
-            echo "$i"
-        done
-        read incoming
-    done
-    cd $pwd
-}
-
-
 ListAllPartitions() {
     local res currline partition all_partitions ap_orig remaining i j
@@ -749 +725 @@
 ### Sq-Modification ... Use kernelname for module search path if specified
 ###
-    if [ "${kernelname}" != "" -a "${kernelname}" != "FAILSAFE" ]
+    if [ "${kernelname}" != "" ]
     then
         kern=${kernelname}
@@ -809 +785 @@
 
     for file in $incoming ; do
+        if [ ! -f $file ]; then
+            continue
+        fi
         echo "$file"
         if [ ! -h $file ]; then
@@ -907 +886 @@
 
 
-# Called by TurnTgzIntoRdz, to make /tmp/mondo-restore.cfg
+# Called by TurnTgzIntoRdz, to make mondorestore.cfg
 MakeMondoConfigFile() {
     local outfile use_lzo use_comp use_star
@@ -968 +947 @@
     if [ $LVM != "false" ]; then
         LogFile "Analyzing LVM..."
-        $MINDI_LIB/analyze-my-lvm > $MINDI_TMP/lvm.res
+        $MINDI_DATA/analyze-my-lvm > $MINDI_TMP/lvm.res
         if [ $? -ne 0 ]; then
             LVM="false"
@@ -980 +959 @@
     done
     [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
-    printf "%-15s %-15s %-15s %-15s %15s\n" DEVICE MOUNTPOINT FORMAT "SIZE MB" LABEL/UUID | tee -a $LOGFILE
-    printf "%-15s %-15s %-15s %-15s %15s\n" ------ ---------- ------  -------  ---------- | tee -a $LOGFILE
+    printf "%-15s %-15s %-15s %-15s %s\n" DEVICE MOUNTPOINT FORMAT "SIZE MB" LABEL/UUID | tee -a $LOGFILE
+    printf "%-15s %-15s %-15s %-15s %s\n" ------ ---------- ------  -------  ---------- | tee -a $LOGFILE
     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
@@ -1343 +1322 @@
     mkdir -p $MINDI_TMP/iso/{images,archives}
     cp -f $MINDI_CACHE/{*.gz,*.img} $MINDI_TMP/iso/images 2>> $LOGFILE || LogAll "OfferToMakeBootableISO: Cannot copy $MINDI_CACHE/*.gz to $MINDI_TMP/iso/images"
-    LogFile "mindi_lib = $MINDI_LIB" 
+    LogFile "mindi_lib = $MINDI_DATA" 
     for i in memdisk memtest.bin memtest.img ; do
-        j=$MINDI_LIB/$i
+        j=$MINDI_DATA/$i
         k=$MINDI_TMP/iso
         if [ -e "$j" ] ; then
@@ -1424 +1403 @@
     fi
     echo -en "."
-    LogFile "Unmounting $USBDEVICE just in case" 
+    LogFile "Unmounting $USBPART just in case"
     umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
     # If your key has no MBR it may cause an issue
@@ -1454 +1433 @@
     $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
     echo -en "."
+    # Some distro do auto mount at that point (Ubuntu)
+    LogFile "Unmounting $USBPART just in case again"
+    umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
+    echo -en "."
     LogFile "Creating a vfat filesystem on $USBPART" 
     mkdosfs -F 32 $USBPART 2>&1 >> $LOGFILE
@@ -1475 +1458 @@
     cp -f $MINDI_CACHE/*.img $MINDI_CACHE/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogAll "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
     echo -en "."
-    LogFile "mindi_lib = $MINDI_LIB" 
+    LogFile "mindi_lib = $MINDI_DATA" 
     for i in memdisk memtest.bin memtest.img ; do
-        j=$MINDI_LIB/$i
+        j=$MINDI_DATA/$i
         k=$MINDI_TMP/usb
         if [ -e "$j" ] ; then
@@ -1528 +1511 @@
         DESC=`head -1 $iss`
     fi
-    sed "s/ZZZZZ/$MINDI_VERSION/" $MINDI_LIB/msg-txt | sed "s/KKKKK/Kernel $KERVER/" | sed "s/AAAAA/on a $ARCH architecture/" | sed "s/TTTTT/`LC_TIME=C date`/" | sed "s/MMMMM/`hostname`/" | sed "s/DDDDD/$DESC/"
+    sed "s/ZZZZZ/$MINDI_VERSION/" $MINDI_DATA/msg-txt | sed "s/KKKKK/Kernel $KERVER/" | sed "s/AAAAA/on a $ARCH architecture/" | sed "s/TTTTT/`LC_TIME=C date`/" | sed "s/MMMMM/`hostname`/" | sed "s/DDDDD/$DESC/"
     if [ _"$MONDO_SHARE" != _"" ]; then
         if [ "$CDRECOVERY" != "yes" ] ; then
@@ -1535 +1518 @@
             elif [ ! "$MINDI_TMP" ] ; then
                 echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
-                if [ -e "$MINDI_LIB/memtest.img" ] ; then
+                if [ -e "$MINDI_DATA/memtest.img" ] ; then
                  echo -en "Type 'memtest' <Enter> to test your PC's memory intensively.\nJust press <Enter> to go to the main test menu.\n"
                 fi
@@ -1618 +1601 @@
     done
 
-    if [ -e "$MINDI_LIB/memtest.img" ] ; then
+    if [ -e "$MINDI_DATA/memtest.img" ] ; then
         if [ "$type" = "elilo" ]; then
             echo -en "image=/memtest.bin\n\tlabel=memtest\n"
@@ -1642 +1625 @@
     [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
     echo -en "Making "$BOOT_SIZE"KB boot disk..."
-    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/initrd.img `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into initrd.img; are you SURE your kernel supports loopfs?"
+    TurnTgzIntoRdz $MINDI_DATA/rootfs $MINDI_TMP/initrd.img `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into initrd.img; are you SURE your kernel supports loopfs?"
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$BOOT_SIZE.img
@@ -1685 +1668 @@
     fi
     MakeMessageFile > $mountpoint/message.txt
-
-    mkdir -p $mountpoint/tmp
-    if [ -f "$MINDI_TMP/mondo-restore.cfg" ]; then
-        cp -f $MINDI_TMP/mondo-restore.cfg $mountpoint/tmp
-    fi
 
     # copy the kernel across
@@ -1714 +1692 @@
     # make it bootable
     [ "$mountpoint" != "" ] && rm -f $mountpoint/zero
-    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
+    [ -e "$MINDI_DATA/memdisk" ] && cp -f $MINDI_DATA/memdisk $mountpoint 2>> $LOGFILE
     if [ "$KERN_DISK_MADE" ] ; then
         LogFile "Not running LILO. It's not that kind of disk." 
@@ -1748 +1726 @@
     [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
     echo -en "Making "$BOOT_SIZE"KB boot disk..."
-    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/initrd.img `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into initrd.img; are you SURE your kernel supports loopfs?"
+    TurnTgzIntoRdz $MINDI_DATA/rootfs $MINDI_TMP/initrd.img `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into initrd.img; are you SURE your kernel supports loopfs?"
     echo -en "..."
     imagefile=$MINDI_TMP/mindi-bootroot.$BOOT_SIZE.img
@@ -1777 +1755 @@
         LogAll "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?)"
         retval=$(($retval+1))
-    fi
-
-    mkdir -p $mountpoint/tmp
-    if [ -f "$MINDI_TMP/mondo-restore.cfg" ]; then
-        cp -f $MINDI_TMP/mondo-restore.cfg $mountpoint/tmp
     fi
 
@@ -1810 +1783 @@
     [ "$mountpoint" != "" ] && rm -f $mountpoint/zero
     mkdir -p $mountpoint/etc
-    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
+    [ -e "$MINDI_DATA/memdisk" ] && cp -f $MINDI_DATA/memdisk $mountpoint 2>> $LOGFILE
     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
     echo -en "..."
@@ -1872 +1845 @@
     res=$?
     rm -f $includefile
-    if [ "$YOUR_KERNEL_SUCKS" ]; then
-        pwd=`pwd`
-        cd $MINDI_TMP
-        rm -f lkm.lis
-        ListKernelModulePaths lkm.lis
-        for i in `cat lkm.lis | HackPathsToFailsafe` ; do
-            tar cf - ./$i 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir" $MINDI_TMP/$$.log
-        done
-        rm -f lkm.lis
-        for i in $EXTRA_MODS ; do
-            j=`find lib/modules/$FAILSAFE_KVER -name $i.*o.gz 2> /dev/null`
-            [ ! "$j" ] && LogFile "WARNING - cannot find failsafe module $i.o.gz" 
-            for k in $j ; do
-                tar cf - $k 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || LogAll "ERROR on module $k" $MINDI_TMP/$$.log
-                LogFile "Added failsafe module $k to ramdisk" 
-            done
-        done
-        cd $pwd
-    else
-        # This function appends to the file passed in param
-        ListKernelModulePaths $needlist
-    fi
+    # This function appends to the file passed in param
+    ListKernelModulePaths $needlist
     if [ "$res" -ne "0" ] ; then
         Die "You have $res files present in dependency list\nbut absent from filesystem."
@@ -1899 +1852 @@
     FindAndAddUserKeyboardMappingFile
     mkdir -p $bigdir/tmp
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        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
     DropOptimizedLibraries $needlist $bigdir
@@ -1949 +1898 @@
     echo -e "$DONE"
     TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
-    MakeMountlist $MINDI_TMP/mountlist.txt
-    CheckMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $bigdir/tmp
-    cp -f $MINDI_TMP/mountlist.txt $bigdir/tmp/mountlist.txt 2>> $LOGFILE || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        cp -f $bigdir/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
-    fi
     if [ $LVM != "false" ]; then
-        $MINDI_LIB/analyze-my-lvm > $bigdir/tmp/i-want-my-lvm 
+        $MINDI_DATA/analyze-my-lvm > $bigdir/tmp/i-want-my-lvm 
         if [ "$?" -ne "0" ]; then
             LVM="false"
@@ -1963 +1906 @@
         fi
     fi
-    cat $bigdir/tmp/mountlist.txt >> $LOGFILE
-    LogFile "-----------------------------------"
 
     LogFile -en "$FILES_IN_FILELIST" > $bigdir/FILES-IN-FILELIST
-    echo -en "$LAST_FILELIST_NUMBER" > $bigdir/LAST-FILELIST-NUMBER 2>> $LOGFILE
     if [ _"$MONDO_SHARE" != _"" ]; then
         for q in filelist.full.gz biggielist.txt ; do
@@ -1978 +1918 @@
     size_of_all_tools=`du -sk $bigdir | cut -f1`
     (cd $bigdir ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $imagesdir/all.tar.gz || LogAll "Problem creating all.tar.gz" $MINDI_TMP/$$.log)
+    LogFile "Size of the data content"
+    LogFile "------------------------"
     du -sk $imagesdir/*gz >> $LOGFILE
+    LogFile "------------------------"
     echo -e "$DONE"
 
@@ -2211 +2154 @@
 
 TurnTgzIntoRdz() {
-    local tgz_dir_fname rdz_fname tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path
+    local tgz_dir_fname rdz_fname tempfile mountpoint old_pwd nodes kernelsize res currsize not_copied j k s w needed_modules_path
 
     tgz_dir_fname=$1
     rdz_fname=$2
     kernelsize=$3
-    maxsize=$(($BOOT_SIZE-$kernelsize))
-    maxsize=$(($maxsize*2)); # to allow for compression of 50%
+    # Compute the list of all that should be copied/created on the final mountpoint under MINDI_TMP
+    # mkdir.lis will contain the list of directries to create
+    # cp.lis will contain the list of files/dirs to copy
+    # ln.lis will contain the list of files to link to existing files
+    # rm.lis will contain the list of files to remove after the copies
+    # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs
+    if [ -h "/lib64" ]; then
+        echo lib  >> $MINDI_TMP/mkdir.lis
+        echo ln -s lib lib64  >> $MINDI_TMP/ln.lis
+    fi
+
+    [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > $MINDI_CACHE/USE-DEVFS
+    echo  $MINDI_CACHE/USE-DEVFS >> $MIDI_TMP/cp.lis
+
+    # We need a minimal conf in the initial ramdisk
+    mountlis=`grep -v "^#.*" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | cut -d: -f2 | sort -u`
+    ReadAllLink $mountlis >> $MINDI_TMP/mnt.lis
+    LocateDeps `cat $MINDI_TMP/mnt.lis` >> $MINDI_TMP/deps.lis
+    # Special for libs
+    ReadAllLink `grep -E "/lib" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | grep -v "^#.*" | cut -d: -f2` >> $MINDI_TMP/deps.lis
+
+    echo `cat $MINDI_TMP/mnt.lis` `sort -u $MINDI_TMP/deps.lis` >> $MINDI_TMP/cp.lis
+    rm -f $MINDI_TMP/deps.lis $MINDI_TMP/mnt.lis
+
+    # Copy of files mandatory for ld.so
+    echo /etc/ld.so.c* >> $MINDI_TMP/cp.lis
+
+    # Avoid an issue on some distro (RHEL5)
+    echo ./etc/ld.so.conf.d/kernelcap* >> $MINDI_TMP/rm.lis
+
+    # Need for a tmp dir
+    echo tmp >> $MINDI_TMP/mkdir.lis
+
+    # Management of udev (which includes modprobe in rules)
+    ps auxww | grep -v grep | grep -qw udevd
+    if [ $? -eq 0 ]; then
+        echo "udev device manager found" > $MINDI_CACHE/USE-UDEV
+        echo $MINDI_CACHE/USE-UDEV >> $MINDI_TMP/cp.lis
+        LogFile "udev device manager found"
+        echo /etc/udev /lib*/udev >> $MINDI_TMP/cp.lis
+        # This avoids NIC remapping if on another machine at restore time on Debian at least
+        echo ./etc/udev/rules.d/z[0-9][0-9]_persistent-net.rules >> $MINDI_TMP/rm.lis
+        # This avoids NIC remapping if on another machine at restore time on Ubuntu at least
+        echo ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules >> $MINDI_TMP/rm.lis
+        if [ -x /sbin/udevd ]; then
+            # Get only the files which exist in the udev.files list
+            # and potentially their symlink structure and their deps
+            mountlis=`grep -Ev "^#" $MINDI_CONF/udev.files`
+            ReadAllLink $mountlis | sort -u >> $MINDI_TMP/udev.lis
+            LocateDeps `cat $MINDI_TMP/udev.lis` | sort -u >> $MINDI_TMP/cp.lis
+            cat $MINDI_TMP/udev.lis >> $MINDI_TMP/cp.lis
+            rm -f $MINDI_TMP/udev.lis
+        else
+            LogAll "udevd daemon not in standard place (/sbin)"
+            LogAll "mindi will use static devices which may cause problems"
+            rm -f $MINDI_CACHE/USE-UDEV
+        fi
+    fi
+
+    # Management of potential HW info (Proliant only at the moment)
+    rm -rf $MINDI_CACHE/bkphw
+    mindi-bkphw $MINDI_CACHE $MINDI_CONF | tee -a $LOGFILE
+    if [ -d $MINDI_CACHE/bkphw ]; then
+        LogAll "Hardware Information found and saved ..."
+        echo $MINDI_CACHE/bkphw >> $MIDNDI_TMP/cp.lis
+        if [ -f $MINDI_CACHE/tools.files ]; then
+            lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
+            LocateDeps $lis > $MINDI_TMP/tools.lis
+            echo $lis `sort -u $MINDI_TMP/tools.lis` >> $MINDI_TMP/cp.lis
+        fi
+        if [ -f $MINDI_CACHE/mindi-rsthw ]; then
+            chmod 755 $MINDI_CACHE/mindi-rsthw
+            echo $MINDI_CACHE/mindi-rsthw >> $MINDI_TMP/cp.lis
+        fi
+        rm -f $MINDI_TMP/tools.lis $MINDI_CACHE/tools.files
+    fi
+
+    # Management of perl scripts delivered needed at restore time
+    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` >> $MINDI_TMP/cp.lis
+
+    for w in cdrom groovy-stuff ; do
+        echo mnt/$w >> $MINDI_TMP/mkdir.lis
+    done
+
+    ls /dev/fd0*[1,2][4,7,8]* >> $MINDI_TMP/cp.lis 2> /dev/null
+
+    if [ "${kernelname}" != "" ]
+    then
+        needed_modules_path=/lib/modules/${kernelname}
+    else
+        needed_modules_path=/lib/modules/$KERVERRUN
+    fi
+
+    needed_modules=""
+    list_of_groovy_mods="$CDROM_MODS $FORCE_MODS"
+
+    if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
+        # For PXE boot
+        list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
+    fi
+    if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
+        list_of_groovy_mods="$list_of_groovy_mods $EXTRA_MODS"
+    fi
+    for i in $DENY_MODS; do
+        LogFile "Removing $i from the list of modules to load" 
+        list_of_groovy_mods=`echo ${list_of_groovy_mods} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
+    done
+
+    [ -e "$needed_modules_path" ] || LogAll "path $needed_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
+    for i in $list_of_groovy_mods ; do
+        needed_modules="$needed_modules `FindSpecificModuleInPath $needed_modules_path $i`"
+    done
+
+    for i in $needed_modules ; do
+        [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
+        LogFile "Adding $i ($s KB) to the rootfs" 
+        echo $i >> $MINDI_TMP/cp.lis
+    done
+
+    # Also copy modules.dep in case of udev so that normal modprobe works
+    echo $needed_modules_path/modules.dep >> $MINDI_TMP/cp.lis
+
+    # Manages mountlit.txt
+    MakeMountlist $MINDI_CACHE/mountlist.txt
+    CheckMountlist $MINDI_CACHE/mountlist.txt
+    echo $MINDI_CACHE/mountlist.txt >> $MINDI_TMP/cp.lis
+    cat $MINDI_CACHE/mountlist.txt >> $LOGFILE
+    LogFile "-----------------------------------"
+
+    if [ ! -e "/sbin/devfsd" ] ; then
+        LogFile "Deleting devfsd daemon from ramdisk because /sbin/devfsd not found" 
+        echo ./sbin/devfsd >> $MINDI_TMP/rm.lis
+    fi
+
+    cd $old_pwd
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        MakeMondoConfigFile $MINDI_CACHE/mondorestore.cfg
+        echo $MINDI_CACHE/mondorestore.cfg >> $MINDI_TMP/cp.lis
+    fi
+    echo proc >> $MINDI_TMP/mkdir.lis
+
+    # Copy of files mandatory for ssh to automate mount if sshfs is used
+    echo .ssh >> $MINDI_TMP/mkdir.lis
+
+    # Now create the container and do the job
     tempfile=$MINDI_TMP/temp.rd
     mountpoint=$MINDI_TMP/mnt1
@@ -2225 +2311 @@
     echo -en "..."
     LogFile "Creating ext2 filesystem on $tempfile" 
-    mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE || Die "Unable to create an ext2 file system on $tempfile"
+    mke2fs -b 1024 -m 0 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE || Die "Unable to create an ext2 file system on $tempfile"
     echo -en "..."
     mkdir -p $mountpoint
@@ -2231 +2317 @@
     echo -en "..."
     old_pwd=`pwd`
-    cd $mountpoint
-
-    # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs
-    if [ -h "/lib64" ]; then
-        mkdir -p lib || LogAll "Unable to create lib in $mountpoint."
-        ln -s lib lib64 || LogAll "/lib64 is a symbolic link, but I couldn't create it in $mountpoint."
-    fi
-
-    cp -Rdf $tgz_dir_fname/* . 2>&1 >> $LOGFILE
-
-    cd dev || Die "Can't cd to dev"
-    tar -zxf dev-entries.tgz || Die "Cannot untar dev-entries.tgz"
-    rm -f dev-entries.tgz
-    cd ..
-
-    for w in insmod.static insmod.static.old ; do
-        s=`which $w 2> /dev/null`
-        if [ -e "$s" ] ; then
-            tar cf - -C / $s 2> /dev/null | tar xf -
-        fi
-    done
-
-    [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
-
-    # We need a minimal conf in the initial ramdisk
-    mountlis=`grep -v "^#.*" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | cut -d: -f2 | sort -u`
-    ReadAllLink $mountlis > $MINDI_TMP/mnt.lis
-    LocateDeps `cat $MINDI_TMP/mnt.lis` >> $MINDI_TMP/deps.lis
-    # Special for libs
-    ReadAllLink `grep -E "/lib" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | grep -v "^#.*" | cut -d: -f2` >> $MINDI_TMP/deps.lis
-
-    # Initial / are trucated by tar
-    tar cf - `cat $MINDI_TMP/mnt.lis` `sort -u $MINDI_TMP/deps.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in mount analysis" $MINDI_TMP/$$.log
-    rm -f $MINDI_TMP/deps.lis
+
+    # First create dirs
+    for d in `cat $MINDI_TMP/mkdir.lis`; do
+        mkdir -p $mountpoint/$d 2>&1 >> $LOGFILE
+    done
+
+    # Then copy files needed
+    LANGUAGE=C tar cf - `cat $MINDI_TMP/cp.lis` | (cd $mountpoint ; tar xf - ) 2>&1 | grep -Ev "tar: Removing.*/\'" >> $LOGFILE 
+
+    # Then handle links
+    if [ -f $MINDI_TMP/ln.lis ]; then
+        (cd $mountpoint ; bash $MINDI_TMP/ln.lis) 2>&1 >> $LOGFILE
+    fi
+
+    # Finally remove useless stff
+    (cd $mountpoint ; rm -f `cat $MINDI_TMP/rm.lis`) 2>&1 >> $LOGFILE 
 
     # Copy of files mandatory for ssh to automate mount if sshfs is used
-    mkdir $mountpoint/.ssh
     cp -rp ~root/.ssh/*.pub ~root/.ssh/config ~root/.ssh/known* $mountpoint/.ssh 2> /dev/null
     cat > $mountpoint/bin/myssh << EOF
@@ -2274 +2341 @@
     chmod 755 $mountpoint/bin/myssh
 
-    # Copy of files mandatory for ld.so
-    cp -rp /etc/ld.so.c* $mountpoint/etc
-
-    # Avoid an issue on some distro (RHEL5)
-    rm -f $mountpoint/etc/ld.so.conf.d/kernelcap*
-
-    mkdir -p $mountpoint/tmp
-    # Management of udev (which includes modprobe in rules)
-    ps auxww | grep -v grep | grep -qw udevd
-    if [ $? -eq 0 ]; then
-        echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
-        LogFile "udev device manager found"
-        tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogAll "Problem in /etc/udev analysis" $MINDI_TMP/$$.log
-        # This avoids NIC remapping if on another machine at restore time on Debian at least
-        rm -f ./etc/udev/rules.d/z[0-9][0-9]_persistent-net.rules
-        # This avoids NIC remapping if on another machine at restore time on Ubuntu at least
-        rm -f ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules
-        tar cf - -C / /lib*/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogAll "Problem in /lib/udev analysis" $MINDI_TMP/$$.log
-        if [ -x /sbin/udevd ]; then
-            lis2=`grep -Ev '^#' $MINDI_CONF/udev.files` 
-            lis=""
-            # Get only the files which exist in that list
-            # and potentially their symlink structure
-            for i in $lis2; do
-                if [ -h $i ]; then
-                    j=$i
-                    while [ -h $j ]; do
-                        lis="$lis $j"
-                        j=`readlink -f $j`
-                    done
-                    lis="$lis $j"
-                elif [ -f $i ]; then
-                    lis="$lis $i"
-                fi
-            done
-            # And their deps
-            LocateDeps $lis > $MINDI_TMP/udev.lis
-            for i in $lis; do
-                if [ "`echo $i | cut -c1`" = "/" ]; then
-                    j=`echo $i | cut -c2-`
-                    [ "$j" != "" ] && rm -f $j
-                fi
-            done
-            tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in udev.lis analysis" $MINDI_TMP/$$.log
-            rm -f $MINDI_TMP/udev.lis
-        else
-            LogAll "udevd daemon not in standard place (/sbin)"
-            LogAll "mindi will use static devices which may cause problems"
-            rm -f $mountpoint/tmp/USE-UDEV
-        fi
-    fi
-
-    # Management of potential HW info (Proliant only at the moment)
-    rm -rf $MINDI_CACHE/bkphw
-    mindi-bkphw $MINDI_CACHE $MINDI_CONF | tee -a $LOGFILE
-    if [ -d $MINDI_CACHE/bkphw ]; then
-        LogAll "Hardware Information found and saved ..."
-        cp -rp $MINDI_CACHE/bkphw .
-        if [ -f $MINDI_CACHE/tools.files ]; then
-            lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
-            LocateDeps $lis > $MINDI_TMP/tools.lis
-            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in tools.lis analysis" $MINDI_TMP/$$.log
-        fi
-        if [ -f $MINDI_CACHE/mindi-rsthw ]; then
-            mv -f $MINDI_CACHE/mindi-rsthw .
-            chmod 755 ./mindi-rsthw
-        fi
-        rm -f $MINDI_TMP/tools.lis $MINDI_CACHE/tools.files
-    fi
-
-    # Management of perl scripts delivered needed at restore time
-    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` > $MINDI_TMP/perl.lis
-    tar cf - `cat $MINDI_TMP/perl.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in perl scripts analysis" $MINDI_TMP/$$.log
-
-    for w in cdrom groovy-stuff ; do
-        mkdir -p mnt/$w
-    done
-
-    tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2>> $MINDI_TMP/$$.log | tar xf -  || LogAll "Problem in fd dev analysis" $MINDI_TMP/$$.log
-
-    cd $old_pwd
-    echo -en "..."
-    old_pwd=`pwd`
-    if [ "$YOUR_KERNEL_SUCKS" ] ; then
-        cd $MINDI_TMP
-        needed_modules_path=lib/modules/$FAILSAFE_KVER
-    else
-        cd /
-        if [ "${kernelname}" != "" ]
-        then
-            needed_modules_path=lib/modules/${kernelname}
-        else
-            needed_modules_path=lib/modules/$KERVERRUN
-        fi
-    fi
-
-    needed_modules=""
-    list_of_groovy_mods="$CDROM_MODS $FORCE_MODS"
-
-    if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
-        # For PXE boot
-        list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
-    fi
-    if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
-        list_of_groovy_mods="$list_of_groovy_mods $EXTRA_MODS"
-    fi
-    for i in $DENY_MODS; do
-        LogFile "Removing $i from the list of modules to load" 
-        list_of_groovy_mods=`echo ${list_of_groovy_mods} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
-    done
-
-    [ -e "$needed_modules_path" ] || LogAll "path $needed_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
-    for i in $list_of_groovy_mods ; do
-        needed_modules="$needed_modules `FindSpecificModuleInPath $needed_modules_path $i`"
-    done
-
-    for i in $needed_modules ; do
-        [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
-        [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
-        LogFile "Adding $i ($s KB) to the rootfs" 
-        tar cf - -C / $i 2>> $MINDI_TMP/$$.log | (cd $mountpoint ; tar xf -) || LogAll "Unable to copy $i to $mountpoint" $MINDI_TMP/$$.log
-        # Uncompress modules if not using udev and native modprobe
-        if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
-            if [ "`echo "$i" | grep -F ".gz"`" ]; then
-                LogFile "Uncompressing $i" 
-                gunzip -f $mountpoint/$i
-            fi
-        fi
-    done
-
-    # Also copy modules.dep in case of udev so that normal modprobe works
-    tar cf - -C / /$needed_modules_path/modules.dep 2>> $MINDI_TMP/$$.log | (cd $mountpoint ; tar xf -) || LogAll "Unable to copy modules.dep to $mountpoint" $MINDI_TMP/$$.log
-
-    if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
-        LogFile "Deleting devfsd daemon from ramdisk" 
-        [ ! -e "/sbin/devfsd" ] && LogFile "...because /sbin/devfsd not found" 
-        [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] && LogFile "...because kernel is failsafe" 
-        rm -f $mountpoint/sbin/devfsd
-    fi
-    cd $old_pwd
-    dd if=/dev/zero of=$mountpoint/zero &> /dev/null
-    rm -f $mountpoint/zero
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
-        cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP 2>> $LOGFILE || Die "Cannot copy mondo-restore.cfg to ramdisk"
-        cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ 2>> $LOGFILE || Die "Cannot copy mountlist to ramdisk"
-        echo -en "$LAST_FILELIST_NUMBER" > $mountpoint/tmp/LAST-FILELIST-NUMBER
-    fi
-    mkdir -p $mountpoint/proc
-    echo "$BOOT_SIZE" > $mountpoint/tmp/$BOOT_SIZE.siz
+    # Finally integrate what we provide statically as part of mindi
+    (cd $tgz_dir_fname ; LANGUAGE=C tar cf - . ) | (cd $mountpoint ; tar xf - )  2>&1 | grep -Ev "tar: Removing.*/\'" >> $LOGFILE 
+
+    # Extracting devices
+    bash
+    (cd $mountpoint/dev ; tar -zxf dev-entries.tgz) || Die "Cannot untar dev-entries.tgz"
+    rm -f $mountpoint/dev/dev-entries.tgz
 
     LogFile "---------------------------"
@@ -2510 +2434 @@
 [ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
 LogFile "MONDO_SHARE = $MONDO_SHARE" 
-LogFile "MINDI_LIB = $MINDI_LIB" 
+LogFile "MINDI_DATA = $MINDI_DATA" 
 LogFile "MINDI_SBIN = $MINDI_SBIN" 
 [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
@@ -2547 +2471 @@
     LogFile "However, you may wish to ask your vendor to provide a permanent fix..." 
     LogFile " Or you might like to call 'su -' instead of 'su', for example." 
-fi
-
-# If we have a distribution-specific script for finding a FAILSAFE kernel, use it.
-if [ -f "$MINDI_LIB/FindDistroFailsafe" ] && [ ! "$1" = "--makemountlist" ] && [ "$kernelpath" = "FAILSAFE" ]; then
-    source $MINDI_LIB/FindDistroFailsafe
-    # Log kernel image
-    LogAll "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
-else
-    [ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
 fi
 
@@ -2759 +2674 @@
         LogAll "kernelname = $kernelname"
         LogAll "kernelpath = $kernelpath"
-        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
+        if [ ! -d "/lib/modules/$kernelname" ]
         then
            LogAll "Module path for ${kernelpath} not found..."
@@ -2784 +2699 @@
     #       LogAll "LILO will use conservative settings, to be compatible with older BIOSes."
         fi
-        LAST_FILELIST_NUMBER=${12}
-        ESTIMATED_TOTAL_NOOF_SLICES=${13}
-        export EXCLUDE_DEVS="${14}"
-        USE_COMP="${15}"
-        USE_LILO="${16}"
-        USE_STAR="${17}"
-        INTERNAL_TAPE_BLOCK_SIZE="${18}"
-        DIFFERENTIAL="${19}"
-        USE_GZIP="${20}"
-        USE_LZMA="${21}"
-        NOT_BOOT="${22}"
+        ESTIMATED_TOTAL_NOOF_SLICES=${12}
+        export EXCLUDE_DEVS="${13}"
+        USE_COMP="${14}"
+        USE_LILO="${15}"
+        USE_STAR="${16}"
+        INTERNAL_TAPE_BLOCK_SIZE="${17}"
+        DIFFERENTIAL="${18}"
+        USE_GZIP="${19}"
+        USE_LZMA="${20}"
         [ "$USE_COMP" = "" ] && USE_COMP=yes
         [ "$USE_GZIP" = "" ] && USE_GZIP=no
         [ "$USE_LZMA" = "" ] && USE_LZMA=no
-        [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
         [ "$TAPEDEV" ] && LogAll "This is a tape-based backup. Fine."
         [ "$kernelpath" = "" ] && kernelpath=`TryToFindKernelPath`
         kernelname=`echo $kernelpath | cut -d'-' -f2-`
-        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
+        if [ ! -d "/lib/modules/$kernelname" ]
         then
            LogAll "Module path for ${kernelpath} not found..."
@@ -2830 +2742 @@
 [ "$CDRECOVERY" = "yes" ] || CDRECOVERY=no
 
-if [ _"$MONDO_SHARE" = _"" ]; then
-    LogAll "Mindi Linux mini-distro generator v$MINDI_VERSION"
-    LogAll "Latest Mindi is available from http://www.mondorescue.org"
-    LogAll "------------------------------------------------------------------------------"
-else
-    LogFile "You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks" 
-fi
-# for Mandrake 9.2, which comes with two aes.o.gz modules :-/
-insmod /lib/modules/$KERVERRUN/*/*/misc/aes.*o.gz >> $LOGFILE 2>> $LOGFILE
-for i in loop cdrom ide-cd isofs linear raid0 raid1 raid5 ; do
-    insmod $i >> $LOGFILE 2>> $LOGFILE
-done
+LogAll "Mindi Linux mini-distro generator v$MINDI_VERSION"
+LogAll "Latest Mindi is available from http://www.mondorescue.org"
+LogAll "------------------------------------------------------------------------------"
 
 KERN_DISK_MADE=""
@@ -2847 +2750 @@
 LogFile "DIFFERENTIAL = $DIFFERENTIAL" 
 LogFile "INTERNAL TAPE BLOCK SIZE = $INTERNAL_TAPE_BLOCK_SIZE" 
-LogFile "NOT_BOOT = '$NOT_BOOT'" 
-if [ "$NOT_BOOT" != "" ] && [ "$NOT_BOOT" != "0" ] && [ "$NOT_BOOT" != "no" ] ; then
-    LogAll "Just creating mondo-restore.cfg and a small all.tar.gz for Mondo. Nothing else."
-    MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
-    MakeMountlist $MINDI_TMP/mountlist.txt
-    CheckMountlist $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>> $LOGFILE || Die "Cannot copy small all.tar.gz"
-    tar -cv ./tmp | gzip -9 > $MINDI_TMP/all.tar.gz 2>> $MINDI_TMP/$$.log || Die "Cannot make small all.tar.gz" $MINDI_TMP/$$.log
-    sleep 2
-    LogAll "Done. Exiting."
-    MindiExit 0
-fi
 
 if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
@@ -2876 +2765 @@
     fi
     if [ "$USE_OWN_KERNEL" = "yes" ]; then
-        YOUR_KERNEL_SUCKS=""
         kernelpath=`TryToFindKernelPath`
         if [ "$kernelpath" = "" ] ; then
@@ -2882 +2770 @@
             read kernelpath
         fi
-    else
-        YOUR_KERNEL_SUCKS="That's why you're using mine, dude. :-)"
-    fi
-fi
-if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then
-    # If we have a distribution-specific script for finding a FAILSAFE kernel, use it.
-    if [ -f "$MINDI_LIB/FindDistroFailsafe" ] && [ ! "$1" = "--makemountlist" ]; then
-        source $MINDI_LIB/FindDistroFailsafe
-        # Log kernel image
-        LogAll "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
-        kernelpath="$FAILSAFE_KBIN"
-        LogAll "I shall include a failsafe kernel, not your kernel, in the boot disks.\n"
-        LogAll "The failsafe kernel is $kernelpath.\n"
-        LogAll "However, you are still running your kernel. If Mindi fails to create your\n"
-        LogAll "disks then it may still be a result of a problem with your kernel.\n"
-        pwd=`pwd`
-        cd $MINDI_TMP
-        mkdir -p lib/modules
-        cp -a "/lib/modules/$FAILSAFE_KVER" "lib/modules/$FAILSAFE_KVER" || Die "Cannot copy kernel modules."
-        cd $pwd
-    else
-        kernelpath=$MINDI_LIB/vmlinuz
-        LogAll "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
-        LogAll "However, you are still running your kernel. If Mindi fails to create your"
-        LogAll "disks then it may still be a result of a problem with your kernel."
-        pwd=`pwd`
-        cd $MINDI_TMP
-        bzip2 -dc $MINDI_LIB/lib.tar.bz2 | tar -x || Die "Cannot unzip lib.tar.bz2"
-        cd $pwd
-    fi
-    YOUR_KERNEL_SUCKS="Your kernel sucks"
+    fi
 fi
 LogFile "Mindi's temp dir=$MINDI_TMP"
@@ -2918 +2776 @@
 [ "$(($RANDOM%64))" -eq "0" ] && LogAll "Dude, I've looked inside your computer and it's really dusty..."
 
-[ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it.\nGo to http://www.mondorescue.org and download it, then install it."
-
 PrepareDataDiskImages
 
-ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
-rds=$(($ramdisk_size-$((ramdisk_size%4096))))
-export ramdisk_size=$rds
+export ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
 
 LogFile "Ramdisk will be $ramdisk_size KB" 
@@ -2933 +2787 @@
 fi
 
-[ -e "$MINDI_LIB/memtest.img" ] && BOOT_MEDIA_MESSAGE="$BOOT_MEDIA_MESSAGE\n\
+[ -e "$MINDI_DATA/memtest.img" ] && BOOT_MEDIA_MESSAGE="$BOOT_MEDIA_MESSAGE\n\
 ...Or type 'memtest' to test your PC's RAM thoroughly.\n"
 

branches/2.2.10/mindi/mindi-bkphw

@@ -89 +89 @@
     close(SCRIPT);
 } else {
-    print "\nWARNING: No Hardware support for $productname. Not a big issue, just less features and risks ;-)\n";
+    print "\nWARNING: No Hardware support for $productname.\nNot a big issue, just less features and risks ;-)\n";
     print "You may ask your manufacturer to contribute to the mindi project\n";
 }

branches/2.2.10/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -7 +7 @@
     for device in /dev/hd? /dev/scd? /dev/rcd? /dev/sr? /dev/cd? /dev/ide/*/*/*/*/cd /dev/scsi/*/*/*/*/cd; do
         [ ! "$SECOND_TRY" ] && LogIt "Trying $device"
-        if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg 2> /dev/null`" ]; then
+        if [ "`grep "using-cdstream yes" $MINDI_CACHE/mondorestore.cfg 2> /dev/null`" ]; then
             pwd=`pwd`
             cd $GROOVY
@@ -75 +75 @@
 fi
 [ "$1" = "--second-try" ] && exit 1; 
-if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg 2 > /dev/null`" ] ; then
+if [ "`grep "using-cdstream yes" $MINDI_CACHE/mondorestore.cfg 2 > /dev/null`" ] ; then
     LogIt "Because you are using cdstream, I won't try to mount CD."
     exit 0

branches/2.2.10/mindi/rootfs/sbin/hack-cfg-if-necessary

@@ -16 +16 @@
 LogIt "OK, we've found /mnt/cdrom/archives/*; great."
 
-if ! grep "backup-media-type iso" /tmp/mondo-restore.cfg 2 > /dev/null ; then
+if ! grep "backup-media-type iso" $MINDI_CACHE/mondorestore.cfg 2 > /dev/null ; then
     LogIt "Config file is fine, BTW."
     exit 0
 fi
 
-LogIt "Re-jigging mondo-restore.cfg because you backed up to ISOs and then burned them to CDs" 1
-sed -i 's/backup-media-type iso/backup-media-type cdr/' /tmp/mondo-restore.cfg
+LogIt "Re-jigging mondorestore.cfg because you backed up to ISOs and then burned them to CDs" 1
+sed -i 's/backup-media-type iso/backup-media-type cdr/' $MINDI_CACHE/mondorestore.cfg
 LogIt "Done re-jigging. Yay."
 exit 0

branches/2.2.10/mindi/rootfs/sbin/init

@@ -5 +5 @@
 # init script launched during the restore process
 #------------------------------------------------------------
+
+export MINDI_CACHE=CCC
 
 if [ -e "/proc/cmdline" ]; then
@@ -117 +119 @@
     cd $GROOVY
     [ "$1" != "" ] && tapedev=$1
-    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg 2>/dev/null | tr -s ' ' ' ' | cut -d' ' -f2`
+    [ ! "$tapedev" ] && tapedev=`grep media-dev $MINDI_CACHE/mondorestore.cfg 2>/dev/null | tr -s ' ' ' ' | cut -d' ' -f2`
     mt -f $tapedev rewind
     mt -f $tapedev fsf 2
@@ -124 +126 @@
     if [ "$res" -eq "0" ] ; then
         # Store the dev name in case we changed it interactively
-        if [ -f "/tmp/mondo-restore.cfg" ]; then
-            sed -i "s/^media-dev .*$/media-dev  $tapedev/" /tmp/mondo-restore.cfg
+        if [ -f "$MINDI_CACHE/mondorestore.cfg" ]; then
+            sed -i "s/^media-dev .*$/media-dev  $tapedev/" $MINDI_CACHE/mondorestore.cfg
         fi
     fi
@@ -340 +342 @@
         return
     fi
-    if [ -x ./mindi-rsthw ]; then
+    if [ -x $MINDI_CACHE/mindi-rsthw ]; then
         grep -q RESTORE $CMDLINE
         if [ "$?" -ne 0 ]; then
@@ -354 +356 @@
         fi
         if [ "$answer" = "YES" ] ; then
-            ./mindi-rsthw
+            $MINDI_CACHE/mindi-rsthw
         fi
     fi
@@ -454 +456 @@
         return;
     fi
-    if [ "`grep mpath /tmp/mountlist.txt`" ]; then
+    if [ "`grep mpath $MINDI_CACHE/mountlist.txt`" ]; then
         if [ -x /sbin/multipath ]; then
             echo "Starting Mpath..."
@@ -478 +480 @@
     fi
 
-    raid_devices=`grep /dev/md /tmp/mountlist.txt | cut -d' ' -f1`
+    raid_devices=`grep /dev/md $MINDI_CACHE/mountlist.txt | cut -d' ' -f1`
     if which raidstart > /dev/null 2> /dev/null ; then
         for i in $raid_devices ; do
@@ -537 +539 @@
     local res
     mount | grep /mnt/cdrom && return 0
-    [ "`grep "backup_media_type" /tmp/mondo-restore.cfg 2> /dev/null | grep "cdstream"`" ] && return
+    [ "`grep "backup_media_type" $MINDI_CACHE/mondorestore.cfg 2> /dev/null | grep "cdstream"`" ] && return
     LogIt "Trying to mount CD-ROM a 2nd time..."
     find-and-mount-cdrom --second-try
@@ -641 +643 @@
     # Retry failed udev events now that local filesystems are mounted read-write
     # (useful for rules creating network ifcfg files)
-    if [ -e "/tmp/USE-UDEV" ] ; then
+    if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then
         if [ -x /sbin/udevadm ]; then
             /sbin/udevadm trigger --retry-failed
@@ -681 +683 @@
     export DENY_MODS=" "
 fi
-if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg 2> /dev/null`" ]; then
+if [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2> /dev/null`" ]; then
     # Do not try to load usb storage when dealing with OBDR it makes the modprobe hang :-(
     export DENY_MODS="usb-storage $DENY_MODS"
@@ -702 +704 @@
 fi
 
-if [ -e "/tmp/USE-UDEV" ] ; then
+if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then
     RunUdevd
 fi
@@ -719 +721 @@
 #-------------------------------
 UseTmpfs
-if [ ! -e "/tmp/mondo-restore.cfg" ] ; then
-    LogIt "Warning - /tmp/mondo-restore.cfg not found"
+if [ ! -e "$MINDI_CACHE/mondorestore.cfg" ] ; then
+    LogIt "Warning - $MINDI_CACHE/mondorestore.cfg not found"
 fi
 if [ "`grep -i pxe $CMDLINE`" ] || [ "`grep -i net $CMDLINE`" ]; then
@@ -727 +729 @@
 fi
 
-if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg 2>/dev/null`" ] || [ "`grep -i ' udev' /tmp/mondo-restore.cfg 2>/dev/null`" ]; then
+if [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ] || [ "`grep -i ' udev' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ]; then
     HandleTape
     ExtractDataDisksAndLoadModules
@@ -736 +738 @@
     ExtractDataDisksAndLoadModules
     # Fake the conf file to force it to NFS mode, even if we made originally a CD (mandatory for mondorestore to work correctly)
-    sed -i "s/backup-media-type.*/backup-media-type netfs/" /tmp/mondo-restore.cfg
-elif [ "`grep -i usb= $CMDLINE`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg 2>/dev/null | grep media-type`" ]; then
+    sed -i "s/backup-media-type.*/backup-media-type netfs/" $MINDI_CACHE/mondorestore.cfg
+elif [ "`grep -i usb= $CMDLINE`" ] || [ "`grep -i usb $MINDI_CACHE/mondorestore.cfg 2>/dev/null | grep media-type`" ]; then
     . /sbin/start-usb
 
@@ -752 +754 @@
 res=$?
 ConfigureLoggingDaemons
-if [ -e "/tmp/USE-DEVFS" ] ; then
+if [ -e "$MINDI_CACHE/USE-DEVFS" ] ; then
     umount /mnt/cdrom 2> /dev/null
     mv /dev/cdrom /cdrom.lnk 2> /dev/null
@@ -769 +771 @@
 mkdir -p /tmp/tmpfs
 sleep 2
-if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ "`grep /dev/md/ /tmp/mountlist.txt`" != "" ] ; then
+if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ "`grep /dev/md/ $MINDI_CACHE/mountlist.txt`" != "" ] ; then
     LogIt "Creating /dev/md/* softlinks just in case." 1
     mkdir -p /dev/md
@@ -776 +778 @@
     cp -af /dev/md2 /dev/md/2 2> /dev/null
 fi
-[ -e "/tmp/mountlist.txt" ] && cp -f /tmp/mountlist.txt /tmp/mountlist.original
+[ -e "$MINDI_CACHE/mountlist.txt" ] && cp -f $MINDI_CACHE/mountlist.txt $MINDI_CACHE/mountlist.original
 
 if ! [ "`grep -i "pxe" $CMDLINE`" ] ; then
@@ -843 +845 @@
     fi
 fi
-if grep "backup-media-type" /tmp/mondo-restore.cfg > /dev/null 2> /dev/null ; then
+if grep "backup-media-type" $MINDI_CACHE/mondorestore.cfg > /dev/null 2> /dev/null ; then
     LogIt "backup-media-type is specified in config file - great."
     LogIt "Calling post-init"

branches/2.2.10/mindi/rootfs/sbin/post-init

@@ -7 +7 @@
 sleep 1
 
-echo "Here is my /tmp/mountlist.txt" >> $LOGFILE
-cat /tmp/mountlist.txt >> $LOGFILE
+echo "Here is my $MINDI_CACHE/mountlist.txt" >> $LOGFILE
+cat $MINDI_CACHE/mountlist.txt >> $LOGFILE
+echo "-----------------------------------" >> $LOGFILE
+
 
 iso=`grep iso $CMDLINE`
@@ -45 +47 @@
 
 mondoopt=""
-if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg 2> /dev/null`" ]; then
+if [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2> /dev/null`" ]; then
     mondoopt="$mondoopt -o -d $TAPEDEV"
 fi
@@ -60 +62 @@
     mondorestore $mondoopt -Z nuke
 elif [ "$expert" ] ; then
-    if [ "`grep tapedev /tmp/mondo-restore.cfg 2> /dev/null`" ] ; then
+    if [ "`grep tapedev $MINDI_CACHE/mondorestore.cfg 2> /dev/null`" ] ; then
     LogIt "-------------------TAPE MODE-------------------" 1
     loc=`which mondorestore 2> /dev/null`
@@ -73 +75 @@
             fi
     fi
-    elif [ "`grep using-cdstream /tmp/mondo-restore.cfg 2> /dev/null`" ] ; then
+    elif [ "`grep using-cdstream $MINDI_CACHE/mondorestore.cfg 2> /dev/null`" ] ; then
         LogIt "------------------CDSTREAM MODE------------------" 1
         loc=`which mondorestore 2> /dev/null`

branches/2.2.10/mindi/rootfs/sbin/start-netfs

@@ -11 +11 @@
 
 # Get info from config file
-ipdev=`grep netfs-dev /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipaddress=`grep netfs-client-ipaddr /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipnetmask=`grep netfs-client-netmask /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipbroadcast=`grep netfs-client-broadcast /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipgateway=`grep netfs-client-defgw /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-proto=`grep netfs-proto /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipdev=`grep netfs-dev $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipaddress=`grep netfs-client-ipaddr $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipnetmask=`grep netfs-client-netmask $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipbroadcast=`grep netfs-client-broadcast $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipgateway=`grep netfs-client-defgw $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+proto=`grep netfs-proto $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 ipconf=""
 pre=""
 post=""
-export netfsmount=`grep netfs-server-mount /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-export imgname=`grep iso-prefix /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+export netfsmount=`grep netfs-server-mount $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+export imgname=`grep iso-prefix $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 if [ "$imgname" = "" ]; then
     export imgname="mondorescue"
 fi
-export dirimg=`grep netfs-server-path /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+export dirimg=`grep netfs-server-path $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 if [ "$dirimg" = "" ]; then
     export dirimg="/"

branches/2.2.10/mindi/rootfs/sbin/start-usb

@@ -7 +7 @@
 
 # Get info from config file
-MRUSBDEV=`grep usb-dev /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+MRUSBDEV=`grep usb-dev $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 
 # info from cmdline are predominent

branches/2.2.10/mondo-doc/mondoarchive.8

@@ -210 +210 @@
 .TP
 .BI "-k " "path"
-Path of user's kernel. If you are a Debian (<3.0) or Gentoo (<1.4) user then specify
-.B -k FAILSAFE
-as your kernel. Otherwise, you will rarely need this option.
+Path of user's kernel, if you want to use another one than the running one.
 
 .TP

branches/2.2.10/mondo-doc/mondorescue-howto.sgml

@@ -340 +340 @@
 in the 'exclude directories' dialog box. Please put a space in
 between each path, e.g. /shared/private /scratch /nfs /windows
-</entry>
-</row>
-<row>
-<entry>
-<ulink url="images/makernel.png"><inlinemediaobject><imageobject>
-<imagedata fileref="images/makernel-mini">
-</imageobject></inlinemediaobject>
-</ulink>
-</entry>
-<entry>
-Is your kernel sane? Red Hat, Mandrake, SuSE, Debian and Slackware users
-should in general say 'yes' because these vendors are good at
-producing reliable kernels. If you are using Gentoo or LFS
-then your kernel might be non-standard, in which case say 'no' to
-use Mondo's failsafe kernel (provided separately).
 </entry>
 </row>
@@ -1411 +1396 @@
 </tbody></tgroup></informaltable>
 
-</sect2>
-<sect2 id="backup-cmd-failsafe">
-        <title>Standard Example With Failsafe kernel</title>
-<para></para>
-<informaltable><tgroup cols="1"><tbody>
-<row>
-<entry>
-
-bash# mondoarchive -k FAILSAFE -Ow 2
-
-</entry>
-</row>
-</tbody></tgroup></informaltable>
-
-<para>If you have problems during the restore phase, due to your kernel 
-        (which may be the case on some distributions), you may want to explore the Failsafe
-        approach, In order for this option to work you'll have to get 
-        the mindi-kernel tarball or package for your distribution.</para>
-</sect2>
-<sect2 id="backup-cmd-network">
-        <title>Standard Example With Network Backup</title>
-<para></para>
-<informaltable><tgroup cols="1"><tbody>
-<row>
-<entry>
-
-        bash# mount nfs://192.168.1.3:/home/nfs -t nfs /mnt/nfs
-</entry>
-</row>
-<row>
-        <entry>
-        bash# mondoarchive -OVn nfs://192.168.1.3:/home/nfs -g -s 200m
-</entry>
-</row>
-<row>
-        <entry>
-        bash# umount /mnt/nfs
-
-</entry>
-</row>
-</tbody></tgroup></informaltable>
-
-<para>The resultant ISO's can be burned to CD's if you want (which
-isn't a good idea unless you're a Mondo expert because they'll try
-to restore over a network by default, which is silly because the
-archives are on the CD's). Or, you can boot from the Mindi media
-(or mondorescue.iso) and hit ENTER a few times to restore.</para>
-<para>Those ISO images can also be used for a PXE restore. For this 
-        to work, please refer to the file README.pxe provided with 
-        your mindi package.
-</para>
 </sect2>
 </sect1>
@@ -2156 +2090 @@
 <para>Mondo (technically, Mindi on behalf of Mondo) creates a file
 called a mountlist. This can be found on the ramdisk at
-/tmp/mountlist.txt; it looks something like this:</para>
+/var/cache/mindi/mountlist.txt; it looks something like this:</para>
 <para></para>
 <informaltable><tgroup cols="1"><tbody>
@@ -2269 +2203 @@
 automatically partition and format your disks for you, including
 the RAID devices.</para>
-<para>Once you have finished editing /tmp/mountlist.txt using
+<para>Once you have finished editing /var/cache/mindi/mountlist.txt using
 mondorestore's built-in editor then you may choose 'OK'. Please
 note that this will not write anything to your hard disk. You will
@@ -2617 +2551 @@
 <qandaentry>
 <question><para>Q: When I try to boot from the Mondo CD,
-it says, "VFS: Unable to mount root fs." I am using an old Debian
-distro. What do I do?</para></question>
-<answer>
-<para>A: Ask Debian's designers why they, unlike every other distro
-I can find, have included cramfs and other 'goodies' with their
-kernel. In the meantime, please use '-k FAILSAFE' in your command
-line when calling Mondo.</para>
-<para>A: From Sarge onwards, all stock Debian 2.6 kernels should work fine. If
-you are still using stock Debian 2.4 kernels, FAILSAFE is the way to go.
-Of course, if you have compiled your own kernel and experience problems,
-FAILSAFE is the way to go as well, but this is not really
-Debian-specific.</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question><para>Q: When I try to boot from the Mondo CD,
-it says, "Cannot mount root fs - kernel panic," or something
-similar. What do I do?</para></question>
-<answer>
-<para>A: Recompile your kernel (or use '-k FAILSAFE'). Take a look
-at <link linkend="overview-sysrq-kernelreq">Linux Kernel support</link> to
-see what your kernel must support.</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question><para>Q: When I try to boot from the Mondo CD,
                 it says, "UPGRADE YOUR RAM". What does that mean?</para></question>
 <answer>
@@ -2674 +2582 @@
 in lilo and speeds up booting, for more info see the lilo man
 page.</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question><para>Q: I made a Mondo CD using the failsafe
-kernel (i.e. I said 'no' when Mondo asked if I wanted to use my own
-kernel). It still doesn't boot. Help!</para></question>
-<answer>
-<para>A: OK, now that is a bug. :-) I included a kernel with Mondo
-(technically, with Mindi, which Mondo uses) to make sure that users
-could use Mondo despite flaws in their own kernels. If you are
-using Mondo/Mindi's kernel but still cannot boot from your Mondo CD
-then please e-mail the &ML;.</para>
 </answer>
 </qandaentry>
@@ -2963 +2859 @@
         <para>
                 A: Look at <filename>/var/log/mindi.log</filename> and see what it
-says. Also, try typing 'mindi --makemountlist /tmp/mountlist.txt'
+                says. Also, try typing 'mindi --makemountlist /var/cache/mindi/mountlist.txt'
 to see what Mindi says. Send the log to the &ML; if you get stuck.
 </para>

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -513 +513 @@
     char *bootldr_str = NULL;
     char *tape_device = NULL;
-    char *last_filelist_number = NULL;
     char *broken_bios_sz = NULL;
     char *cd_recovery_sz = NULL;
@@ -546 +545 @@
     }
     lines_in_filelist = count_lines_in_file(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    last_filelist_number = last_line_of_file(tmp);
     mr_free(tmp);
 
@@ -805 +800 @@
             (bkpinfo->image_devs == NULL) ? "\"\"" : bkpinfo->image_devs,   // parameter #10
             broken_bios_sz,     // parameter #11
-            last_filelist_number,   // parameter #12 (STRING)
-            estimated_total_noof_slices,    // parameter #13 (INT)
-            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #14
-            use_comp_sz,        // parameter #15
-            use_lilo_sz,        // parameter #16
-            use_star_sz,        // parameter #17
-            bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
-            bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz,        // parameter #20 (STRING)
-            use_lzma_sz,        // parameter #21 (STRING)
+            estimated_total_noof_slices,    // parameter #12 (INT)
+            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #13
+            use_comp_sz,        // parameter #14
+            use_lilo_sz,        // parameter #15
+            use_star_sz,        // parameter #16
+            bkpinfo->internal_tape_block_size,  // parameter #17 (LONG)
+            bkpinfo->differential,  // parameter #18 (INT)
+            use_gzip_sz,        // parameter #19 (STRING)
+            use_lzma_sz,        // parameter #20 (STRING)
             MONDO_LOGFILE);
 
     mr_free(tmp2);
-    mr_free(last_filelist_number);
     mr_free(tape_device);
     mr_free(use_lzo_sz);

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -671 +671 @@
         mr_free(bkpinfo->kernel_path);
         mr_asprintf(bkpinfo->kernel_path, "%s", flag_val['k']);
-        if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
-            mr_free(bkpinfo->kernel_path);
-            mr_asprintf(bkpinfo->kernel_path, "FAILSAFE");
-        }
-        if (strcmp(bkpinfo->kernel_path, "FAILSAFE") && !does_file_exist(bkpinfo->kernel_path)) {
+        if (!does_file_exist(bkpinfo->kernel_path)) {
             retval++;
             log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -2731 +2731 @@
                 paranoid_fclose(fin);
             } else {
-                if (does_file_exist("/tmp/mondo-restore.cfg")) {
+                if (does_file_exist(MINDI_CACHE"/mondorestore.cfg")) {
                     mr_free(bkpinfo->media_device);
-                    bkpinfo->media_device = read_cfg_var("/tmp/mondo-restore.cfg", "media-dev");
+                    bkpinfo->media_device = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "media-dev");
                 }
             }
@@ -3075 +3075 @@
             ("Will you want to verify your backups after Mondo has created them?");
 
-#ifndef __FreeBSD__
-        if (!ask_me_yes_or_no
-            ("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))
-#endif
-        {
-            mr_free(bkpinfo->kernel_path);
-            mr_asprintf(bkpinfo->kernel_path, "FAILSAFE");
-        }
-
         if (!ask_me_yes_or_no
             ("Are you sure you want to proceed? Hit 'no' to abort.")) {

branches/2.2.10/mondo/src/common/libmondo-filelist.c

@@ -322 +322 @@
     mr_free(biggie_fname);
 
-    mr_asprintf(outfname, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    mr_asprintf(tmp, "%ld", curr_set_no);
-    if (write_one_liner_data_file(outfname, tmp)) {
-        log_OS_error
-            ("Unable to echo write one-liner to LAST-FILELIST-NUMBER");
-        err = 1;
-    }
+    mr_asprintf(tmp, "echo 'last-filelist-number %ld' >> "MINDI_CACHE"/mondorestore.cfg", curr_set_no);
+    paranoid_system(tmp);
     mr_free(tmp);
-    mr_free(outfname);
 
     if (curr_set_no == 0) {
@@ -708 +702 @@
     assert(bkpinfo != NULL);
 
-    mr_asprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
+    mr_asprintf(cfg_fname, "%s/mondorestore.cfg", MINDI_CACHE);
     val_sz = read_cfg_var(cfg_fname, "last-filelist-number");
     mr_free(cfg_fname);

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -705 +705 @@
 
 /**
- * Determine the size (in KB) of @p dev in the mountlist in <tt>tmpdir</tt>/mountlist.txt.
+ * Determine the size (in KB) of @p dev in the mountlist in mountlist.txt.
  * @param tmpdir The tempdir where the mountlist is stored.
  * @param dev The device to search for.
@@ -717 +717 @@
     long file_len_K;
 
-    mr_asprintf(mountlist, "%s/mountlist.txt", tmpdir);
-    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, tmpdir);
+    mr_asprintf(mountlist, "%s/mountlist.txt", MINDI_CACHE);
+    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, MINDI_CACHE);
     mr_free(mountlist);
 
@@ -992 +992 @@
  * Copy the files that Mondo/Mindi need to run to the scratchdir or tempdir.
  * Currently this includes: copy Mondo's home directory to scratchdir, 
- * copy LAST-FILELIST-NUMBER to scratchdir, copy post-nuke.tgz (if it exists) to tmpdir, 
+ * copy post-nuke.tgz (if it exists) to tmpdir, 
  * and run "hostname > scratchdir/HOSTNAME".
  * @param bkpinfo The backup information structure. Fields used:
@@ -1020 +1020 @@
     if (res) {
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
-    }
-
-    mr_asprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
-    res = run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    if (res) {
-        fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
 

branches/2.2.10/mondo/src/common/libmondo-stream.c

@@ -856 +856 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    mr_asprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null", outfname);
+    mr_asprintf(tmp, "tar -zxf %s ."MINDI_CACHE"/mondorestore.cfg 2> /dev/null", outfname);
     paranoid_system(tmp);
     mr_free(tmp);
 
-    paranoid_system("cp -f tmp/mondo-restore.cfg . 2> /dev/null");
+    paranoid_system("cp -f ."MINDI_CACHE"/mondorestore.cfg . 2> /dev/null");
     chdir(old_cwd);
     unlink(outfname);

branches/2.2.10/mondo/src/common/libmondo-tools.c

@@ -1071 +1071 @@
 /**
  * Retrieve the line containing @p label from the config file.
- * @param config_file The file to read from, usually @c /tmp/mondo-restore.cfg.
+ * @param config_file The file to read from, usually @c mondorestore.cfg.
  * @param label What to read from the file.
  * @param value Where to put it.
@@ -1294 +1294 @@
  * Write a line to a configuration file. Writes a line of the form,
  * @c label @c value.
- * @param config_file The file to write to. Usually @c mondo-restore.cfg.
+ * @param config_file The file to write to. Usually @c mondorestore.cfg.
  * @param label What to call this bit of data you're writing.
  * @param value The bit of data you're writing.

branches/2.2.10/mondo/src/common/mondostructures.h

@@ -557 +557 @@
 
   /**
-   * Path to the user's kernel, or "FAILSAFE" or "SUCKS" to use the kernel
-   * included with Mindi.
+   * Path to the user's kernel included with Mindi.
    */
     char *kernel_path;

branches/2.2.10/mondo/src/include/my-stuff.h

@@ -74 +74 @@
  * The location where mindi media images are stored.
  */
-#define MINDI_CACHE "/var/cache/mindi"
+#define MINDI_CACHE_REL "var/cache/mindi"   /* Should be coherent with mindi */
+#define MINDI_CACHE "/"MINDI_CACHE_REL
 
 /**

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -1573 +1573 @@
     if (pout_to_fdisk) {
         // mark relevant partition as bootable
-        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable /tmp/mountlist.txt dummy");
+        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable "MINDI_CACHE"/mountlist.txt dummy");
         mr_asprintf(tmp, "a\n%s\n", tmp1);
         mr_free(tmp1);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -649 +649 @@
     chdir(bkpinfo->restore_path);
 
-    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
@@ -705 +701 @@
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
-    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
 
     mvaddstr_and_log_it(g_currentY,

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -26 +26 @@
  * The mountlist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt"
-
-/**
- * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
+#define MOUNTLIST_FNAME_STUB MINDI_CACHE_REL"/mountlist.txt"
+
+/**
+ * The mondorestore.cfg stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
+#define MONDO_CFG_FILE_STUB MINDI_CACHE_REL"/mondorestore.cfg"
 /**
  * The i-want-my-lvm stub
@@ -157 +157 @@
 
 /**
-* Extract @c mondo-restore.cfg and @c mountlist.txt from @p ramdisk_fname.
+* Extract @c mondorestore.cfg and @c mountlist.txt from @p ramdisk_fname.
 * @param bkpinfo The backup information structure. @c tmpdir is the only field used.
 * @param ramdisk_fname The filename of the @b compressed ramdisk to look in.
@@ -167 +167 @@
 
 /**
-* Keep trying to get mondo-restore.cfg from the archive, until the user gives up.
+* Keep trying to get mondorestore.cfg from the archive, until the user gives up.
 */
 void get_cfg_file_from_archive_or_bust()
@@ -678 +678 @@
 /**
 * Fill out @p bkpinfo based on @p cfg_file.
-* @param cfg_file The mondo-restore.cfg file to read into @p bkpinfo.
+* @param cfg_file The mondorestore.cfg file to read into @p bkpinfo.
 * @param bkpinfo The backup information structure to fill out with information
 * from @p cfg_file.
@@ -1574 +1574 @@
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
             log_msg(1, "Yay! grub-MR found...");
-            mr_asprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
+            mr_asprintf(command, "grub-MR %s "MINDI_CACHE"/mountlist.txt", boot_device);
             log_msg(1, "command = %s", command);
         } else {
@@ -1872 +1872 @@
     } else {
         /* nuke mode */
-        mr_asprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
+        mr_asprintf(command, "raw-MR %s "MINDI_CACHE"/mountlist.txt", boot_device);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
 
@@ -2128 +2128 @@
 
 /**
- * Extract mondo-restore.cfg and the mountlist from the tape inserted
+ * Extract mondorestore.cfg and the mountlist from the tape inserted
  * to the ./tmp/ directory.
  * @param dev The tape device to read from.
@@ -2261 +2261 @@
             mr_free(tmp);
 
-            if (!does_file_exist("tmp/mondo-restore.cfg")) {
+            if (!does_file_exist(MINDI_CACHE_REL"/mondorestore.cfg")) {
                 log_to_screen("Cannot find config info on media");
                 return (1);
@@ -2345 +2345 @@
     }
 
-    log_to_screen("Recovered mondo-restore.cfg");
+    log_to_screen("Recovered mondorestore.cfg");
     if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
         log_to_screen("...but not mountlist.txt - a pity, really...");

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -102 +102 @@
 
 /**
- * The location of 'mondo-restore.cfg', containing the metadata
+ * The location of 'mondorestore.cfg', containing the metadata
  * information for this backup.
  */
@@ -162 +162 @@
     assert(raidlist != NULL);
     if (!bkpinfo->disaster_recovery) {
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         log_msg(2, "I guess you're testing edit_mountlist()");
     }
@@ -2074 +2074 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    log_msg(2, "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
+    log_msg(2, "Insisting on 1st CD");
     if (g_current_media_number != 1) {
         log_msg(3, "OK, that's jacked up.");
@@ -2695 +2695 @@
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
         if (!does_file_exist(g_mountlist_fname)) {
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         }
         res = let_user_edit_the_mountlist(mountlist, raidlist);
@@ -2795 +2795 @@
         log_msg(0, "Partitioning only.");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         load_mountlist(mountlist, g_mountlist_fname);
         res = partition_everything(mountlist);
@@ -2804 +2804 @@
         log_msg(0, "Formatting only.");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         load_mountlist(mountlist, g_mountlist_fname);
         res = format_everything(mountlist, FALSE, raidlist);
@@ -2813 +2813 @@
         log_msg(0, "Stopping LVM and RAID");
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        strcpy(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
         load_mountlist(mountlist, g_mountlist_fname);
         res = do_my_funky_lvm_stuff(TRUE, FALSE);

branches/2.2.10/mondo/src/restore-scripts/mondo/format-and-kludge-vfat

@@ -115 +115 @@
 umount /mnt/tmpK || Die "Can't unmount /mnt/tmpK"
 
-ideal_size=`grep "$device " /tmp/mountlist.txt | tr -s ' ' ' ' | cut -d' ' -f4`
+ideal_size=`grep "$device " $MINI_CACHE/mountlist.txt | tr -s ' ' ' ' | cut -d' ' -f4`
 if [ "$ideal_size" = "" ]; then 
     LogIt "format-and-kludge-vfat --- can't find $device in mountlist" 1

branches/2.2.10/mondo/src/restore-scripts/mondo/grub-MR

@@ -93 +93 @@
 
 if [ "$#" -ne "2" ] ; then
-    Die "grub-MR <MBR drive> <mountlist filename>; e.g. grub-MR /dev/hda /tmp/mountlist.txt"
+    Die "grub-MR <MBR drive> <mountlist filename>; e.g. grub-MR /dev/hda $MINDI_CACHE/mountlist.txt"
 fi
 [ ! -f "$2" ] && Die "mountlist file not found"

branches/2.2.10/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -55 +55 @@
 LogIt "Identifying your drives with tune2fs"
 if [ "$#" -ne "1" ] ; then
-    LogIt "label-partitions-as-necessary /tmp/mountlist.txt < /tmp/fstab.new" 1
+    LogIt "label-partitions-as-necessary $MINDI_CACHE/mountlist.txt < /tmp/fstab.new" 1
     exit 1
 fi

branches/2.2.10/mondo/src/restore-scripts/mondo/mount-me

@@ -1 +1 @@
 #!/bin/sh
 
-mountlist=/tmp/mountlist.txt
+mountlist=$MINDI_CACHE/mountlist.txt
 
 if [ "$#" -ne "0" ] ;then

branches/2.2.10/mondo/src/restore-scripts/mondo/stabelilo-me

@@ -122 +122 @@
 
 WhatIsFirstDriveCalled() {
-    cut -d' ' -f1 /tmp/mountlist.txt \
+    cut -d' ' -f1 $MINDI_CACHE/mountlist.txt \
 | sed s/[0-9]// | sed s/[0-9]// \
 | sort -u | head -n 1
@@ -133 +133 @@
 LocateOldFstab
 LocateOldElilo
-old_mountlist=/tmp/mountlist.original
-new_mountlist=/tmp/mountlist.txt
+old_mountlist=$MINDI_CACHE/mountlist.original
+new_mountlist=$MINDI_CACHE/mountlist.txt
 QuitIfNotFound $old_mountlist
 QuitIfNotFound $new_mountlist

branches/2.2.10/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -116 +116 @@
 LocateOldFstab
 LocateOldGrub
-old_mountlist=/tmp/mountlist.original
-new_mountlist=/tmp/mountlist.txt
+old_mountlist=$MINDI_CACHE/mountlist.original
+new_mountlist=$MINDI_CACHE/mountlist.txt
 QuitIfNotFound $old_mountlist
 QuitIfNotFound $new_mountlist

branches/2.2.10/mondo/src/restore-scripts/mondo/stablilo-me

@@ -91 +91 @@
 
 WhatIsFirstDriveCalled() {
-    cut -d' ' -f1 /tmp/mountlist.txt \
+    cut -d' ' -f1 $MINDI_CACHE/mountlist.txt \
 | sed s/[0-9]// | sed s/[0-9]// \
 | sort -u | head -n 1
@@ -101 +101 @@
 LogIt "stablilo-me --- starting"
 LocateOldFstab
-old_mountlist=/tmp/mountlist.original
-new_mountlist=/tmp/mountlist.txt
+old_mountlist=$MINDI_CACHE/mountlist.original
+new_mountlist=$MINDI_CACHE/mountlist.txt
 QuitIfNotFound $old_mountlist
 QuitIfNotFound $new_mountlist

branches/2.2.10/mondo/src/restore-scripts/mondo/stabraw-me

@@ -82 +82 @@
 LogIt "stabraw-me --- starting"
 LocateOldFstab
-old_mountlist=/tmp/mountlist.original
-new_mountlist=/tmp/mountlist.txt
+old_mountlist=$MINDI_CACHE/mountlist.original
+new_mountlist=$MINDI_CACHE/mountlist.txt
 QuitIfNotFound $old_mountlist
 QuitIfNotFound $new_mountlist

branches/2.2.10/mondo/src/restore-scripts/mondo/unmount-me

@@ -1 +1 @@
 #!/bin/sh
 
-mountlist=/tmp/mountlist.txt
+mountlist=$MINDI_CACHE/mountlist.txt
 
 if [ "$#" -ne "0" ] ;then

branches/2.2.10/mondo/test/test-mountlist.c

@@ -68 +68 @@
 
 setup_newt_stuff();
-mr_asprintf(g_mountlist_fname, "/tmp/mountlist.txt");
+mr_asprintf(g_mountlist_fname, MINDI_CACHE"/mountlist.txt");
 log_it("before mountlist");
 load_mountlist(mountlist, g_mountlist_fname);