Changeset 1079 in MondoRescue

Timestamp:

Jan 28, 2007, 5:58:18 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1045:1078 £SVN_M/branches/stable

Location:

trunk

Files:

• mindi/analyze-my-lvm (modified) (2 diffs)
• mindi/distributions/conf/deplist.d/addon.conf (copied) (copied from branches/stable/mindi/distributions/conf/deplist.d/addon.conf )
• mindi/distributions/conf/deplist.d/lvm.conf (modified) (1 diff)
• mindi/distributions/conf/mindi.conf.dist (modified) (4 diffs)
• mindi/distributions/debian/FindDistroFailsafe (copied) (copied from branches/stable/mindi/distributions/debian/FindDistroFailsafe )
• mindi/distributions/freebsd/pkg-plist (modified) (2 diffs)
• mindi/distributions/rpm/mindi.spec (modified) (1 diff)
• mindi/install.sh (modified) (2 diffs)
• mindi/mindi (modified) (50 diffs)
• mindi/rootfs/etc/HOSTNAME (deleted)
• mindi/rootfs/etc/bashrc (deleted)
• mindi/rootfs/etc/group (modified) (1 diff)
• mindi/rootfs/etc/hosts (modified) (1 diff)
• mindi/rootfs/etc/ld.so.conf (modified) (1 diff)
• mindi/rootfs/etc/ld.so.conf.RH6 (deleted)
• mindi/rootfs/etc/login.defs (deleted)
• mindi/rootfs/etc/passwd (modified) (1 diff)
• mindi/rootfs/etc/resolv.conf (deleted)
• mindi/rootfs/etc/shells (modified) (1 diff)
• mindi/rootfs/etc/termcap (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (2 diffs)
• mondo-doc/mindi.8 (modified) (5 diffs)
• mondo-doc/mondoarchive.8 (modified) (4 diffs)
• mondo/INSTALL (modified) (1 diff)
• mondo/Makefile.am (modified) (1 diff)
• mondo/bootstrap (modified) (1 diff)
• mondo/configure.in (modified) (1 diff)
• mondo/distributions/rpm/mondo.spec (modified) (1 diff)
• mondo/po/POTFILES.in (modified) (2 diffs)
• mondo/src/common/Makefile.am (modified) (1 diff)
• mondo/src/common/crcttt.h (deleted)
• mondo/src/common/libmondo-archive.c (modified) (6 diffs)
• mondo/src/common/libmondo-devices.c (modified) (4 diffs)
• mondo/src/common/libmondo-fifo.c (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (1 diff)
• mondo/src/common/libmondo-raid.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/common/libmondo-verify.c (modified) (1 diff)
• mondo/src/common/mondostructures.h (modified) (2 diffs)
• mondo/src/include/crcttt.h (copied) (copied from branches/stable/mondo/src/include/crcttt.h )
• mondo/src/include/mr_conf.h (modified) (1 prop)
• mondo/src/include/mr_str.h (modified) (1 prop)
• mondo/src/include/my-stuff.h (modified) (1 diff, 1 prop)
• mondo/src/lib/mr_conf.c (modified) (1 prop)
• mondo/src/lib/mr_str.c (modified) (1 prop)
• mondo/src/mondoarchive/Makefile.am (modified) (1 diff)
• mondo/src/mondoarchive/mondo-cli.c (modified) (8 diffs)
• mondo/src/mondorestore/Makefile.am (modified) (1 diff)
• mondo/src/mondorestore/mondo-restore.c (modified) (2 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.h (modified) (1 diff)
• mondo/src/test/mktest (modified) (2 diffs)
• mondo/src/test/mondo.conf (modified) (1 diff)
• mondo/src/test/test-conf.c (modified) (2 diffs, 1 prop)
• mondo/src/test/test-conf.res (modified) (1 diff)
• mondo/src/test/test-msg.c (copied) (copied from branches/stable/mondo/src/test/test-msg.c )
• mondo/src/test/test-msg.res (copied) (copied from branches/stable/mondo/src/test/test-msg.res )
• mondo/src/test/test-string.c (modified) (2 diffs, 1 prop)
• mondo/src/test/test-string.res (modified) (1 diff)
• tools/build2pkg (modified) (1 diff)
• tools/distro-env (modified) (1 diff)
• tools/mdiff (copied) (copied from branches/stable/tools/mdiff )
• tools/mval (modified) (1 diff, 1 prop)
• tools/quality (modified) (2 diffs)
• tools/svn2build (modified) (1 diff)
• website/announces3.sql (modified) ( previous)
• website/docs.shtml (modified) (1 diff)

trunk/mindi/analyze-my-lvm

@@ -3 +3 @@
 # $Id$
 #
-
-#------------------------- ANALYZE-MY-LVM ----------------------- Hugo Rabson
-# 07/14
-# - no longer blank first 4k of /dev/mdX
-#
-# 06/14/2004
-# - fixed "n >= 2.00" bug (shell doesn't handle floating points properly)
-# - handle dm_mod as well as dm-mod
-#
-# 02/18/2004
-# - nice patch to fix ListAllVolumeGroups() --- J. Richard
-# - patch to support LVM2 by Takeru Komoriya
-#
-# 10/15/2003
-# - fixed '-L'-handling to allow for floating-point gigabyte values
-#
-# 01/15/2003
-# - patch (LVM) by Brian Borgeson
-#
-# 12/10/2002
-# - patch by Benjamin Mampaey
-#
-# 09/05/2002
-# - additional patch by Ralph Gruwe
-#
-# 08/30/2002
-# - modified by Ralph Gruwe
-#
-# 10/01/2001
-# - last modified by Hugo :)
-#------------------------------------------------------------------------------
 
 Die() {
@@ -186 +155 @@
 ListAllLogicalVolumes() {
     if [ $lvmversion = 2 ]; then
-        $LVMCMD lvscan | grep "'" | cut -d"'" -f2
-    else
-        lvscan | grep '"' | cut -d'"' -f2
+        $LVMCMD lvscan 2> /dev/null | grep "'" | cut -d"'" -f2
+    else
+        lvscan 2> /dev/null | grep '"' | cut -d'"' -f2
     fi
 }

trunk/mindi/distributions/conf/deplist.d/lvm.conf

@@ -3 +3 @@
 # Tools for LVM support
 #
+LVMFILES:
 /etc/lvm/lvm.conf
 /sbin/fsadm

trunk/mindi/distributions/conf/mindi.conf.dist

@@ -18 +18 @@
 
 #
-# deplist directory
+# Maximum compressed size for disk image in KB. 
 #
-mindi_deplist_dir="/etc/mindi/deplist.d"
+mindi_max_compressed_size=1300
+
+#
+# deplist file name (stored in $MINDI_CONF)
+#
+mindi_deplist_file="deplist.txt"
 
 #
@@ -38 +43 @@
 
 #
+# Write mindi USB (yes|no) ?
+#
+mindi_write_usb="no"
+
+#
+# If set to "no", you will be prompted for whether or not
+# you want to use your own kernel, or the supplied default.
+# If "yes" mindi will automatically use your own kernel.
+#
+mindi_use_own_kernel="yes"
+
+#
 # Images creation dir
+# WARNING: This directory is erased before usage
 #
 mindi_images_dir="/var/cache/mindi"
@@ -54 +72 @@
 #
 # Additional Boot Parameters
+# You may want to remove acpi=off if you're unable to reboot on mindi's CD
+# You may want to add ramdisk_size=1024 if on Fedora Core 5/6
 #
 mindi_boot_params="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
 
-# TBC
 #  
 # Kernel to use (NATIVE|FAILSAFE|PATH TO THE KERNEL)
@@ -64 +83 @@
 #mindi_kernel="/boot/vmlinuz.special"
 
-# TBC
+#
+# Modules supported by mindi and required at boot time 
+#
+mindi_scsi_mods="3w-xxxx 3w_xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
+mindi_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x"
+mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid"
+mindi_pcmcia_mods="pcmcia_core ds yenta_socket"
+mindi_cdrom_mods="cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate"
+mindi_tape_mods="ht st osst ide-tape ide_tape"
+mindi_floppy_mods="ide-floppy floppy"
+mindi_net_mods="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
+mindi_extra_mods="vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod dm-snapshot dm-zero dm-mirror jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
 #  
-#
-# Additinal modules to support 
+# Additional modules to support 
 # (white space separated list of modules)
 #
-mindi_additional_modules=""
-
-# TBC
-#  
-#
-# Boot loader to use
-# (GRUB|ELILO|LILO|RAW|NATIVE)
-#
-mindi_boot_loader="NATIVE"
+mindi_additional_mods=""
 
 #

trunk/mindi/distributions/freebsd/pkg-plist

@@ -1 +1 @@
 etc/mindi/deplist.txt
+etc/mindi/mindi.conf
+etc/mindi/mindi.conf.dist
+etc/mindi/mindi.conf.dist.md5
 doc/ChangeLog
 doc/INSTALL
@@ -13 +16 @@
 @dirrm lib/mindi
 @dirrm etc/mindi
+@dirrm etc/mindi/mindi.d

trunk/mindi/distributions/rpm/mindi.spec

@@ -60 +60 @@
 %config(noreplace) %{_sysconfdir}/mindi/mindi.conf
 %config(noreplace) %{_sysconfdir}/mindi/mindi.conf.dist
+%config(noreplace) %{_sysconfdir}/mindi/mindi.conf.dist.md5
 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
 %{_mandir}/man8/*

trunk/mindi/install.sh

@@ -72 +72 @@
 echo "Copying files ..."
 install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
-install -m 644 deplist.txt $conf
+install -m 644 distributions/conf/deplist.d/* $conf/deplist.d
+install -m 444 distributions/conf/mindi.conf.dist $conf
+#
+# Compute mindi.conf.dist (cecked by mindi) to avoid changes here
+# Modify the checksum file so that path is correct at execution time
+#
+md5sum $conf/mindi.conf.dist > $conf/mindi.conf.dist.md5
+perl -pi -e "s~$conf~$subconf~" $conf/mindi.conf.dist.md5
+#
+# Example of mindi.conf
+#
+cat > $conf/mindi.conf << EOF
+#
+# Configuration file for mindi
+#
+# By default values are taken from $conf/mindi.conf.dist
+# You can override them here
+#
+# e.g.
+#
+#mindi_tmp_dir="/var/tmp"
+#
+EOF
+chmod 644 $conf/mindi.conf
 install -m 644 distributions/conf/deplist.d/* $conf/deplist.d
 install -m 444 distributions/conf/mindi.conf.dist $conf
@@ -89 +112 @@
 chmod 644 $conf/mindi.conf
 
+#
+# Example of deplist.txt
+#
+cat > $conf/deplist.txt << EOF
+# mindi additional dependency list
+#
+# NB:
+# You have to give an absolute path
+# If you want to add something, just add it on its own line. K.I.S.S.
+
+EOF
+chmod 644 $conf/deplist.txt
+
 cp -af rootfs aux-tools $locallib/mindi
+if [ -e FindDistroFailsafe ]; then
+    cp -af FindDistroFailsafe $locallib/mindi
+fi
 chmod 755 $locallib/mindi/rootfs/sbin/*
 chmod 755 $locallib/mindi/aux-tools/sbin/*

trunk/mindi/mindi

@@ -36 +36 @@
 
 MINDI_CONFIG_DIST="$MINDI_CONF/mindi.conf.dist"
-if [ ! -f $MINDI_CONFIG_CONF ]; then
-    echo "Unable to find $MINDI_CONFIG_CONF. Please reinstall mindi"
-    MindiExit -1
+if [ ! -f $MINDI_CONFIG_DIST ]; then
+    echo "Unable to find $MINDI_CONFIG_DIST. Please reinstall mindi"
+    exit -1
+fi
+md5sum --status -c "$MINDI_CONF/mindi.conf.dist.md5"
+if [ $? -ne 0 ]; then
+    echo "$MINDI_CONF/mindi.conf.dist md5 checksum incorrect. Please reinstall mindi"
+    exit -1
 fi
 . $MINDI_CONFIG_DIST
@@ -53 +58 @@
 # Manages defaults coming from conf files
 #
-EXTRA_SPACE=$mindi_extra_space
-IA64_BOOT_SIZE=$mindi_ia64_boot_size
-DEPLIST_DIR="$mindi_deplist_dir"
-# TBC
-WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
-# TBC
-WRITE_MINDI_CD="$mindi_write_cd"
-# TBC
-CACHE_LOC="$mindi_images_dir"
-FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
-TMP_ROOT="$mindi_tmp_dir"
-FDDEVICE="$mindi_fd_device"
-ADDITIONAL_BOOT_PARAMS="$mindi_boot_params"
-MY_FSTAB="$mindi_etc_fstab"
-LOGFILE="$mindi_log_file"
 INTERACTIVE="$mindi_interactive"
 
@@ -80 +70 @@
     PROMPT_MAKE_CD_IMAGE="yes"
 
+    # Ask if you want to make a USB Image to be written?
+    # if this is set to 'no', then the image will be created automatically
+    PROMPT_MAKE_USB_IMAGE="yes"
+
     # If set to "no", you will be prompted for whether or not
     # you want to use your own kernel, or the supplied default.
     # If "yes" mindi will automatically use your own kernel.
     USE_OWN_KERNEL="no"
-else
-    PROMPT_WRITE_BOOT_FLOPPIES="no"
-    PROMPT_MAKE_CD_IMAGE="no"
-    USE_OWN_KERNEL="yes"
 fi
 
-FLOPPY_MODS="ide-floppy floppy"
-TAPE_MODS="ht st osst ide-tape ide_tape"
-SCSI_MODS="3w-xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
-IDE_MODS="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core libata edd paride ata_piix libata via82cxxx generic nvidia ahci"
-PCMCIA_MODS="pcmcia_core ds yenta_socket"
-USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd usbhid"
-CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
-NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
-NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
-EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod dm-snapshot dm-zero dm-mirror jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
+EXTRA_SPACE=$mindi_extra_space
+IA64_BOOT_SIZE=$mindi_ia64_boot_size
+DEPLIST_DIR="$MINDI_CONF/deplist.d"
+DEPLIST_FILE="$MINDI_CONF/$mindi_deplist_file"
+WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
+PROMPT_MAKE_CD_IMAGE="$mindi_write_cd"
+PROMPT_MAKE_USB_IMAGE="$mindi_write_usb"
+USE_OWN_KERNEL="$mindi_use_own_kernel"
+CACHE_LOC="$mindi_images_dir"
+FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
+TMPDIR="$mindi_tmp_dir"
+FDDEVICE="$mindi_fd_device"
+ADDITIONAL_BOOT_PARAMS="$mindi_boot_params"
+MY_FSTAB="$mindi_etc_fstab"
+LOGFILE="$mindi_log_file"
+FLOPPY_MODS="$mindi_floppy_mods"
+TAPE_MODS="$mindi_tape_mods"
+SCSI_MODS="$mindi_scsi_mods"
+IDE_MODS="$mindi_ide_mods"
+PCMCIA_MODS="$mindi_pcmcia_mods"
+USB_MODS="$mindi_usb_mods"
+CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS $mindi_cdrom_mods $USB_MODS $PCMCIA_MODS"
+NET_MODS="$mindi_net_mods"
+EXTRA_MODS="$CDROM_MODS $mindi_extra_mods $mindi_additional_mods"
 
 BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
 FDISK=$MINDI_SBIN/parted2fdisk
-
-# 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
@@ -215 +213 @@
     echo "Added kbd map $mappath" >> $LOGFILE
     if [ ! -e "$mappath" ] ; then
-        mappath=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep "$locale[^r][^/]" | grep -vx " *#.*"`
+            mappath=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
         if [ ! -e "$mappath" ] ; then
             LogIt "Cannot add $mappath: kbd map file not found"
@@ -233 +231 @@
     for included_item in $included_list ; do
         if [ ! -e "$included_item" ] ; then
-            sss=`find $KEYDIR/keymaps | grep -F "${included_item}.inc"`
-            [ "$sss" = "" ] && sss=`find $KEYDIR/keymaps | grep -F "$included_item"`
+                sss=`grep -F "${included_item}.inc" $MINDI_TMP/keymaps.find`
+            [ "$sss" = "" ] && sss=`grep -F "$included_item" $MINDI_TMP/keymaps.find`
             for ii in $sss ; do
                 [ -e "$ii" ] && AddKeyboardMappingFile $ii
@@ -252 +250 @@
     biggienumber=$4
 
-    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist file accordingly."
+    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend $DEPLIST_FILE accordingly."
     mkdir -p $outdir
 
@@ -411 +409 @@
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)"
+    echo "Creating ext2 filesystem on $imagefile" >> $LOGFILE
     mke2fs -N 12 -F $imagefile >> $LOGFILE 2>> $LOGFILE
     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."
@@ -416 +415 @@
     if [ "$?" -ne "0" ] ; then
         umount $mountpoint
-        Die "Tarball $tarball is too big for disk! (CODI)\nTell Dev Team to adjust MAX_COMPRESSED_SIZE"
+        Die "Tarball $tarball is too big for disk! (CODI)\nAdjust mindi_max_compressed_size in your $MINDI_CONFIG"
     fi
     [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
     umount $mountpoint || LogIt "Cannot umount (CODI)"
     rmdir $mountpoint || LogIt "Cannot rmdir (CODI)"
-}
-
-
-DidMondoCallMe() {
-    local res
-
-    res=0
-    [ "`ps ax | grep -F "mondoarchive" | grep -v "grep"`" ] && res=$(($res+1))
-    [ -f "/var/run/monitas-mondo.pid" ] && res=$(($res+1))
-    [ "$res" -gt "1" ] && echo "yes"
 }
 
@@ -463 +452 @@
 
     # Creates a tar file containing all required files
-    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
+    for i in $MY_FSTAB /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
         [ -e "$i" ] && cp -f $i $MINDI_TMP 2>> $LOGFILE
     done
@@ -557 +546 @@
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
     echo "locale=$locale" >> $LOGFILE
-    mp=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep -F "/${locale}." | grep -vx " *#.*"`
-    [ ! "$mp" ] && mp=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep "$locale[^r][^/]" | grep -vx " *#.*"`
+    #
+    # Process the keymaps dir once for all
+    # AddKeyboardMappingFile will use it recursively
+    #
+    find $KEYDIR/keymaps > $MINDI_TMP/keymaps.find
+    mp=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep -F "/${locale}." | grep -vx " *#.*"`
+    [ ! "$mp" ] && mp=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
     # If we have multiple keymaps then log it !!
     echo "$mp" | grep -q " "
@@ -773 +767 @@
         [ "$modres" -eq "3" ] && echo -en "\t|"
     done
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ]; then
         mkdir -p $bigdir/tmp
         mkdir -p $bigdir/sbin
@@ -962 +956 @@
         echo "Problem with dead link on $file -> $link" >> $LOGFILE
     fi
-    if [ "`echo $link | cut -c1`" = "/" ]; then
-        echo "$link `ReadAllLink $link`"
-    else
-        d=`dirname $file`
-        echo "$link `ReadAllLink $d/$link`"
-    fi  
+    if [ -h "$d" ]; then
+        echo "$link $d"
+    else
+        echo "$link"
+    fi
 }
 
@@ -1252 +1245 @@
                 current_partition=$actual_dev
             else
-                Die "Your system uses a LABEL 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"
+                Die "Your system uses a LABEL partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in $MY_FSTAB or install findfs|blkid|vol_id"
             fi
         # This part tries to retrieve the correct device from a UUID line in /etc/fstab
@@ -1300 +1293 @@
                 current_partition=$actual_dev
             else
-                Die "Your system uses a UUID 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"
+                Die "Your system uses a UUID partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in $MY_FSTAB or install findfs|blkid|vol_id"
             fi
         else
@@ -1530 +1523 @@
 OfferToMakeBootableISO() {
     local i old_pwd
-    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "`DidMondoCallMe`" ] ; then
+    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
         echo -en "Shall I make a bootable CD image? (y/[n]) "
         read i
@@ -1536 +1529 @@
     fi
     if [ ! "$MINDI_TMP" ] ; then
-        LogIt "NB: Mindi's bootable CD always uses isolinux."
+        LogIt "NB: Mindi's bootable CD always uses isolinux or elilo."
         LogIt "For a bootable CD w/LILO, please use Mondo."
     fi
@@ -1552 +1545 @@
             cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
-            cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
+            if [ _"$MONDO_SHARE" != _"" ]; then 
+                cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
+            fi
         fi
     done
     MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
-    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
-    cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
     cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
-    cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE
+    if [ _"$MONDO_SHARE" != _"" ]; then 
+        cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2> /dev/null || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+
+    fi
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
     cd $MINDI_TMP/iso/isolinux
-    cat $iso_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/iso > isolinux.cfg || Die "Cannot copy isolinux.cfg from mindi_home to tmp_root - did you run out of disk space?"
+    cat $iso_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/iso > isolinux.cfg || Die "Cannot copy isolinux.cfg to $MINDI_TMP/iso/isolinux - did you run out of disk space?"
     if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
-        mv isolinux.cfg isolinux.cfg.old
-        sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
+        perl -pi -e 's/interactive/iso/' isolinux.cfg
     fi
     if [ "$ARCH" != "ia64" ] ; then
-        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
+        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso/isolinux - did you run out of disk space?"
         cp $ISOLINUX ../ 2>> $LOGFILE
     fi
     cd $MINDI_TMP/iso
     if [ "$ARCH" != "ia64" ] ; then
-        cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2> /dev/null || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
-    fi
-    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .    2>> $LOGFILE
-    if [ "$ARCH" != "ia64" ] ; then
+        if [ _"$MONDO_SHARE" != _"" ]; then 
+            cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2> /dev/null || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            cp -f $MONDO_SHARE/autorun . 2>> $LOGFILE
+        fi
         mkisofs -U -J -r -o $CACHE_LOC/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
     else
@@ -1595 +1592 @@
 
 
+OfferToMakeBootableUSB() {
+    local i old_pwd
+    if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
+        echo "Shall I make a bootable USB image ?"
+        echo -en "WARNING: This will erase all content on $USBDEV (y/[n]) "
+        read i
+        [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
+    fi
+    rm -Rf $MINDI_TMP/usb
+    mkdir -p $MINDI_TMP/usb
+    USBPART="${USBDEV}1"
+
+    echo -en "Transforming $USBDEV in a Bootable device " 
+    echo -en "."
+    echo "Transforming $USBDEV in a Bootable device"  >> $LOGFILE
+    echo "Checking $USBDEV" >> $LOGFILE
+    $FDISK -l $USBDEV 2>&1 >> $LOGFILE
+    if [ $? -ne 0 ]; then
+        echo "Unable to access $USBDEV" | tee -a $LOGFILE
+        echo "Make sure your USB device is pluged in" | tee -a $LOGFILE
+        MindiExit -1
+    fi
+    echo -en "."
+    echo "Erasing $USBDEV" >> $LOGFILE
+    $FDISK $USBDEV 2>&1 >> $LOGFILE << EOF
+d
+d
+d
+d
+n
+p
+1
+
+
+t
+b
+a
+1
+w
+EOF
+    if [ $? -ne 0 ]; then
+        echo "Unable to create a vfat Filesystem on $USBDEV" | tee -a $LOGFILE
+        echo "Make sure your USB device is pluged in" | tee -a $LOGFILE
+        $FDISK -l $USBDEV 2>&1 | tee -a $LOGFILE
+        MindiExit -1
+    fi
+    echo -en "."
+    echo "Creating a vfat filesystem on $USBPART" >> $LOGFILE
+    mkfs -t vfat $USBPART 2>&1 >> $LOGFILE
+    if [ $? -ne 0 ]; then
+        echo "Unable to create a vfat filesystem on $USBPART" | tee -a $LOGFILE
+        echo "Make sure your USB device is pluged in and partitioned ($USBPART must exist on it)" | tee -a $LOGFILE
+        $FDISK -l $USBDEV 2>&1 | tee -a $LOGFILE
+        MindiExit -1
+    fi
+    echo -en "."
+    echo "Mounting $USBPART on $MINDI_TMP/usb" >> $LOGFILE
+    mount $USBPART $MINDI_TMP/usb 2>> $LOGFILE
+    if [ $? -ne 0 ]; then
+        echo "Unable to mount $USBPART on $MINDI_TMP/usb" | tee -a $LOGFILE
+        echo "Make sure your USB device is pluged in, partitioned and formated ($USBPART must exist on it)" | tee -a $LOGFILE
+        $FDISK -l $USBDEV 2>&1 | tee -a $LOGFILE
+        MindiExit -1
+    fi
+    echo -en "."
+    mkdir -p $MINDI_TMP/usb/{images,archives}
+    cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/iso/images"
+    echo -en "."
+    old_pwd=`pwd`
+    cd $MINDI_TMP/usb
+    echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
+    for i in memdisk memtest.bin memtest.img ; do
+        j=$MINDI_LIB/$i
+        k=$MINDI_TMP/usb
+        if [ -e "$j" ] ; then
+            LogIt "Copying $j to $k"
+            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
+            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
+            if [ _"$MONDO_SHARE" != _"" ]; then
+                cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
+            fi
+        fi
+    done
+    echo -en "."
+    MakeSyslinuxMessageFile $MINDI_TMP/usb/message.txt
+    echo -en "."
+    cp $kernelpath $MINDI_TMP/usb/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/usb/syslinux/vmlinuz). Did you run out of disk space?"
+    echo -en "."
+    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/usb/initrd.img 2>> $LOGFILE
+    echo -en "."
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2> /dev/null || Die "Cannot copy mindi.rdz ($MINDI_TMP) to mondo root ($MONDO_ROOT/initrd.img). Did you run out of disk space?"
+
+    fi
+    echo -en "."
+    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
+    cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/usb > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to $MINDI_TMP/usb - did you run out of disk space?"
+    echo -en "."
+    if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
+        perl -pi -e 's/interactive/iso/' syslinux.cfg
+    fi
+    cd $old_pwd
+    echo -en "."
+    if [ "$ARCH" != "ia64" ] ; then
+        if [ _"$MONDO_SHARE" != _"" ]; then
+            cp -f $MINDI_TMP/usb/{syslinux.cfg,initrd.img,vmlinuz,message.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            cp -f $MONDO_SHARE/autorun $MONDO_ROOT 2>> $LOGFILE
+        fi
+        umount $MINDI_TMP/usb
+        syslinux $USBPART 2>> $MINDI_TMP/syslinux.log
+    else
+        echo "No USB boot support for ia64" | tee -a $LOGFILE
+        umount $MINDI_TMP/usb
+        MindiExit -1
+    fi
+    echo -en "."
+    if [ "$?" -ne "0" ] ; then
+        echo "----------- syslinux's errors --------------" |tee -a $LOGFILE
+        cat $MINDI_TMP/syslinux.log |tee -a $LOGFILE
+        LogIt "Failed to create USB image."
+    else
+        echo -e "$DONE"
+        echo "Created bootable USB image on $USBDEV" >> $LOGFILE
+    fi
+    rm -f $MINDI_TMP/syslinux.log
+}
+
+
 PluralOrNot() {
     [ "$1" -gt "1" ] && echo -en "s"
@@ -1609 +1735 @@
     fi
     if [ "$disksize" -gt "2880" ] ; then
-        if [ "`DidMondoCallMe`" ] ; then
+        if [ _"$MONDO_SHARE" != _"" ]; then
             if [ "$CDRECOVERY" != "yes" ] ; then
                 if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
@@ -1642 +1768 @@
     mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
     dd if=/dev/zero of=$image bs=1k count=$disksize &> /dev/null
+    echo "Creating ext2 filesystem on $image" >> $LOGFILE
     mke2fs -N 26 -F $image &> /dev/null
     mkdir -p $mtpt
@@ -1704 +1831 @@
     if [ "$CDRECOVERY" = "yes" ] ; then
         echo -en "default=RESTORE\n"
-    elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
+    elif [ "$disksize" -gt "2880" ] && [ _"$MONDO_SHARE" != _"" ]; then
         if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
             echo -en "default=iso\n"
@@ -1725 +1852 @@
         options="RESTORE expert"
     elif [ "$disksize" -gt "2880" ] ; then
-        if [ "`DidMondoCallMe`" ] ; then
+        if [ _"$MONDO_SHARE" != _"" ]; then
             if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
                 options="iso"
@@ -1746 +1873 @@
             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="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"
@@ -1782 +1909 @@
         t=vfat
     else
+        echo "Creating ext2 filesystem on $imagefile" >> $LOGFILE
         mke2fs -N 26 -m 0 -F $imagefile >> $LOGFILE 2>> $LOGFILE
         t=ext2
@@ -1804 +1932 @@
 
     MakeLiloConfFile $disksize > $liloconf
+
+    # Copy it so that CD-ROM menu entry is satisfied
+    if [ "$ARCH" = "ia64" ] ; then
+        mountefi=0
+        df -T | grep /boot/efi | grep -q vfat
+        if [ $? -ne 0 ]; then
+            mount /boot/efi
+            if [ $? -ne 0 ]; then
+                echo "You have to mount your EFI partition when using mindi"
+                MindiExit -1
+            fi
+            mountefi=1
+        fi
+        cp /boot/efi/elilo.efi $mountpoint
+        cp $liloconf $mountpoint/elilo.efi $mountpoint/efi/boot
+        if [ $mountefi -eq 1 ]; then
+            umount /boot/efi 2>&1 > /dev/null
+        fi
+    fi
 
     echo "Copying $MINDI_TMP/mindi.rdz to $mountpoint..." >> $LOGFILE
@@ -1935 +2082 @@
     else
         dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
+        echo "Creating vfat filesystem on $imagefile" >> $LOGFILE
         mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
         syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
@@ -1947 +2095 @@
     cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
     if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
-        mv syslinux.cfg syslinux.cfg.orig
-        sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
+        perl -pi -e 's/interactive/iso/' syslinux.cfg
     fi
     cd $old_pwd
@@ -2023 +2170 @@
 
 PrepareDataDiskImages() {
-    local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines
+    local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines lfiles
 
     imagesdir=$1
@@ -2034 +2181 @@
     tardir=$MINDI_TMP/tardir
 
-    lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
-    cat $MINDI_CONF/deplist.txt | GenerateGiantDependencyList $needlist $lines
+    if [ -e "$DEPLIST_FILE" ]; then
+        lfiles="$DEPLIST_FILE $DEPLIST_DIR/*"
+    else
+        lfiles="$DEPLIST_DIR/*"
+    fi
+    lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
+    cat $lfiles | GenerateGiantDependencyList $needlist $lines
     res=$?
     if [ "$YOUR_KERNEL_SUCKS" ]; then
@@ -2071 +2223 @@
     FindAndAddUserKeyboardMappingFile
     mkdir -p $bigdir/tmp
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ]; then
         MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
         cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
@@ -2109 +2261 @@
         tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "WARNING - error occurred while unzipping x11-tools.tgz"
     fi
-    if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
+    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"
+        [ "$?" -ne "0" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     fi
     [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE
@@ -2120 +2272 @@
     noof_disks=$?
     [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
-#    if [ "$noof_disks" -ge "8" ] ; then
-#        LogIt "You are putting a ludicrously large amount of data on these disks."
-#        LogIt "I shall therefore double EXTRA_SPACE, just in case your ramdisk is too small."
-#        EXTRA_SPACE=$(($EXTRA_SPACE*2))
-#    fi
     MakeMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $minidir_root/$noof_disks/tmp
     cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
-    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
+    fi
     [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
@@ -2498 +2647 @@
     dd if=/dev/zero of=$tempfile bs=1k count=$ramdisk_size &> /dev/null || Die "Not enough room for temporary ramdisk (TurnTgzIntoRdz)"
     echo -en "..."
+    echo "Creating ext2 filesystem on $tempfile" >> $LOGFILE
     mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE
     echo -en "..."
@@ -2590 +2740 @@
     dd if=/dev/zero of=$mountpoint/zero &> /dev/null
     rm -f $mountpoint/zero
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ]; then
         MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
         cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
@@ -2648 +2798 @@
     cd $minidir_root/all
     size_of_all_tools=`du -sk . | cut -f1`
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ]; then
         for q in filelist.full.gz biggielist.txt ; do
             [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
@@ -2671 +2821 @@
 
 
-if [ "$1" = "-printvar" ] ; then
+if [ "$1" = "--printvar" ] ; then
     shift
     if [ _"$1" != _"" ] ; then
         set | egrep "^$1" | cut -d= -f2
     fi
-    exit 0
+    MindiExit 0
 fi
 
@@ -2740 +2890 @@
 fi
 
-[ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
+# 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
+    LogIt "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
 
 if ! which mkfs.vfat &> /dev/null ; then
@@ -2758 +2915 @@
     FindLiloBinary
 fi
-# BERLIOS: Remove as too dangerous and now useless
-#grep -F " $MINDI_TMP " /proc/mounts | grep -F tmpfs > /dev/null 2> /dev/null && MINDI_TMP=/home/tmpmondo && mkdir -p $MINDI_TMP && LogIt "Changing MINDI_TMP to $MINDI_TMP because you're using tmpfs for /tmp\n" ; # tmpfs doesn't like Mindi and /tmp, for some reason
 trap "Aborted" SIGTERM
 DONE="\r\t\t\t\t\t\t\t\tDone.         "
 CHOPSIZE=240
 BIGNO=0
-MAX_COMPRESSED_SIZE=1300
-kernelpath=""
-MONDO_ROOT=/var/cache/mondo
-mkdir -p $MONDO_ROOT
+MAX_COMPRESSED_SIZE="$mindi_max_compressed_size"
+kernelpath="$mindi_kernel"
+if [ "$kernelpath" = "NATIVE" ]; then
+    kernelpath=""
+fi
+if [ "$ARCH" = "ia64" ] ; then
+    USE_LILO=yes
+else
+    USE_LILO=no
+fi
 
 if [ -d "/proc/lvm" ]; then
@@ -2790 +2951 @@
 lsmod >> $LOGFILE
 echo "-------------" >> $LOGFILE
-
-if [ "$#" -ge "2" ] ; then
-    if [ "$1" = "--max-compressed-size" ] ; then
-        MAX_COMPRESSED_SIZE=$2
-        shift; shift
-    fi
-fi
+echo "Liste of extra modules is:" >> $LOGFILE
+echo "$EXTRA_MODS" >> $LOGFILE
+echo "-------------" >> $LOGFILE
+
 
 FLOPPY_WAS_MOUNTED=""
@@ -2806 +2964 @@
 done
 
+#
+# If we have a USB device we need to store info 
+# and remove it from the parameters line
+#
+if [ "$#" -ne "0" ] ; then
+    if [ "$1" = "--usb" ] ; then
+        shift
+        USBDEV=$1
+        if [ _"$USBDEV" = _"" ]; then
+            Die "No USB device specified"
+        fi
+        shift
+    fi
+fi
+
+#
+# Deal with parameters
+#
 if [ "$#" -ne "0" ] ; then
     if [ "$1" = "--findkernel" ] ; then
@@ -2823 +2999 @@
         MindiExit 0
     elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
+        if [ _"$MONDO_SHARE" = _"" ]; then
+            Die "--custom is reserved for mondoarchive calls"
+        fi
         MONDO_TMP=$2
         # Change MINDI_TMP for the one provided by mondo 
@@ -2837 +3016 @@
         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
 ###
-### Sq-Modification...
 ### Attempt to locate kernel specific module path
 ### if module path is found then use it other wise use uname -r to set it...
 ###
+        if [ "$kernelpath" = "" ]; then 
+            kernelpath=`TryToFindKernelPath`
+        fi
         kernelname=`echo $kernelpath | cut -d'-' -f2-`
         LogIt "kernelname = $kernelname"
@@ -2852 +3033 @@
            LogIt "Using modules for kernel: ${kernelname}"
         fi
-###
-### end of Sq-Modification
-###
         TAPEDEV=$5
         TAPESIZE=$6
@@ -2883 +3061 @@
         [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
         [ "$TAPEDEV" ] && LogIt "This is a tape-based backup. Fine."
-        [ "$kernelpath" = "" ] && kernelpath=`TryToFindKernelPath`
-        kernelname=`echo $kernelpath | cut -d'-' -f2-`
-        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
-        then
-           LogIt "Module path for ${kernelpath} not found..."
-           LogIt "using running kernel\'s modules."
-           kernelname=`uname -r`
-        else
-           LogIt "Using modules for kernel: ${kernelname}"
-        fi
         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
         MONDO_ROOT=`echo $CACHE_LOC | sed 's/\(.*\)\/.*/\1/'`
@@ -2916 +3084 @@
 
 [ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
-if [ ! "`DidMondoCallMe`" ] ; then
+if [ _"$MONDO_SHARE" = _"" ]; then
     LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION"
     LogIt "Latest Mindi is available from http://www.mondorescue.org"
     LogIt "BusyBox sources are available from http://www.busybox.net"
-    LogIt "------------------------------------------------------------------------------"
 else
     echo "You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks" >> /var/log/mondo-archive.log
@@ -2955 +3122 @@
 fi
 
+if [ _"$USBDEV" != _"" ]; then
+    LogIt "Including the generation of a Bootable USB device on $USBDEV"
+fi
 if [ "$kernelpath" = "" ] ; then
-    [ "`DidMondoCallMe`" ] && Die "Please use -k <path> to specify kernel."
-    echo -en "Do you want to use your own kernel to build the boot disk ([y]/n) ?"
-    read ch
-    if [ "$ch" != "n" ] && [ "$ch" != "N" ] ; then
-        USE_OWN_KERNEL="yes"
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        Die "Please use -k <path> to specify kernel."
+    fi
+    if [ $INTERACTIVE == "yes" ]; then
+        echo -en "Do you want to use your own kernel to build the boot disk ([y]/n) ?"
+        read ch
+        if [ "$ch" != "n" ] && [ "$ch" != "N" ] ; then
+            USE_OWN_KERNEL="yes"
+        fi
     fi
     if [ "$USE_OWN_KERNEL" = "yes" ]; then
@@ -2973 +3147 @@
     fi
 fi
-if [ ! "`DidMondoCallMe`" ] ; then
+if [ _"$MONDO_SHARE" = _"" ] && [ $INTERACTIVE = "yes" ] && [ "$ARCH" != "ia64" ] ; then
     echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/[n]) ?"
     read ch
-    if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
-        USE_LILO=no
-    else
+    if [ "$ch" = "y" ] || [ "$ch" = "Y" ] ; then
         USE_LILO=yes
     fi
 fi
 if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then
-    kernelpath=$MINDI_LIB/vmlinuz
-    LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
-    LogIt "However, you are still running your kernel. If Mindi fails to create your"
-    LogIt "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
+    # 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
+        LogIt "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
+        kernelpath="$FAILSAFE_KBIN"
+        LogIt "I shall include a failsafe kernel, not your kernel, in the boot disks.\n"
+        LogIt "The failsafe kernel is $kernelpath.\n"
+        LogIt "However, you are still running your kernel. If Mindi fails to create your\n"
+        LogIt "disks then it may still be a result of a problem with your kernel.\n"
+        pwd=`pwd`
+        cd $TMP_ROOT
+        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
+        LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
+        LogIt "However, you are still running your kernel. If Mindi fails to create your"
+        LogIt "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
@@ -3053 +3242 @@
 ...Or type 'memtest' to test your PC's RAM thoroughly.\n"
 
-if [ ! "`DidMondoCallMe`" ] ; then
+if [ _"$MONDO_SHARE" = _"" ]; then
     ListImagesForUser $CACHE_LOC
     boot_dev=/dev/fd0u1722
@@ -3063 +3252 @@
     fi
     OfferToMakeBootableISO $CACHE_LOC
+    if [ _"$USBDEV" != _"" ] ; then
+        OfferToMakeBootableUSB $CACHE_LOC
+    fi
     LogIt "Finished."
 elif [ "$TAPEDEV" ] ; then
@@ -3072 +3264 @@
         Die "Cannot find all.tar.gz, to be written to tape"
     fi
+elif [ _"$USBDEV" != _"" ] ; then
+    OfferToMakeBootableUSB $CACHE_LOC
 else
     OfferToMakeBootableISO $CACHE_LOC

trunk/mindi/rootfs/etc/group

@@ -6 +6 @@
 tty::5:
 disk::6:root,adm
-lp::7:lp
 mem::8:
 kmem::9:
 wheel::10:root
 floppy::11:root
-mail::12:mail
-news::13:news
-uucp::14:uucp
-man::15:man
-users::100:games
 nogroup::65534:

trunk/mindi/rootfs/etc/hosts

@@ -1 @@
-
 127.0.0.1   localhost
-127.0.0.1   darkstar.frop.org darkstar
-212.216.176.33 mail.tin.it

trunk/mindi/rootfs/etc/ld.so.conf

@@ -2 +2 @@
 /usr/lib
 /usr/local/lib
-/usr/ns/lib
-/usr/vnc/lib
-/usr/tcltk/lib
 /usr/X11R6/lib
-/usr/srv/lib
-/usr/wks/lib
-/usr/gcc/lib
-/usr/perl/lib
-/usr/emu/lib
-/usr/jvm/lib
 /lib64
 /usr/lib64

trunk/mindi/rootfs/etc/passwd

@@ -1 @@
-halt:x:7:0:halt:/sbin:/sbin/halt
-operator:x:11:0:operator:/root:/bin/bash
 root::0:0::/root:/bin/bash
-shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
-sync:x:5:0:sync:/sbin:/bin/sync
 bin:x:1:1:bin:/bin:
-ftp:x:404:1::/home/ftp:/bin/bash
 daemon:x:2:2:daemon:/sbin:
 adm:x:3:4:adm:/var/adm:
-lp:x:4:7:lp:/var/spool/lpd:
-mail:x:8:12:mail:/var/spool/mail:
-postmaster:x:14:12:postmaster:/var/spool/mail:/bin/bash
-news:x:9:13:news:/usr/lib/news:
-uucp:x:10:14:uucp:/var/spool/uucppublic:
-man:x:13:15:man:/usr/man:
-guest:x:405:100:guest:/dev/null:/dev/null
 nobody:x:65534:100:nobody:/dev/null:
-alfa::1001:0:alfa:/alfa:

trunk/mindi/rootfs/etc/shells

@@ -1 +1 @@
 /bin/sh
-

trunk/mindi/rootfs/etc/termcap

@@ -11 +11 @@
 # Some entries in termcap 2.0.7 are too long and your programs
 # may complain "tgetent: warning: termcap entry too long". Here is
-a smaller termcap. But it may not cover as many terminals as the one
+# a smaller termcap. But it may not cover as many terminals as the one
 # in termcap 2.0.7. You can install it as /etc/termcap.
 #

trunk/mindi/rootfs/sbin/init

@@ -272 +272 @@
     if [ "`HowMuchFreeSpaceOnRamdisk`" -le "3" ] ; then
         LogIt "Ramdisk is a bit smaller than I would like." 1
-        LogIt "Please re-run Mondo/Mindi but edit /usr/local/mindi first" 1
+        LogIt "Please re-run Mondo/Mindi but edit mindi first" 1
         LogIt "and set EXTRA_SPACE to something high, e.g. 8000" 1
         Die "Aborting. Please reboot."
@@ -424 +424 @@
 trap CaughtSoftReset SIGTERM
 LOGFILE=/tmp/mondo-restore.log
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/local/mondo:/usr/local/mindi:.
+PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
 GROOVY=/tmp/groovy-stuff
 USER=root

trunk/mondo-doc/mindi.8

@@ -33 +33 @@
 .BI "mindi --makemountlist "file
 .br
-.BI "mindi [--max-compressed-size "max "] --custom " parameters
+.BI "mindi --usb "device
+.br
+.BI "mindi --printvar "variable
 .SH DESCRIPTION
 .PP
@@ -64 +66 @@
 .SH OPTIONS
 .TP
-.BR "-v"| " --version"| " -V"| " -version"
-Prints the version of mindi.
-.TP
-.B --findkernel
-Finds the image of the running kernel in the file system.
+.BI "-v"| " --version"| " -V"| " -version"
+.RI Prints the version of mindi.
+.TP
+.BI "--findkernel"
+.RI Finds the image of the running kernel in the file system.
 .TP
 .BI "--makemountlist "file
 .RI "Creates a mount list and writes it to file "file ".
 .TP
-.BI "--max-compressed-size "max
-Maximum size for disk image in KB.
+.BI "--usb "device
+.RI Create a bootable USB device 
+.TP
+.BI "--printvar "variable
+.RI "prints the value of the variable (useful for mondo-archive and debug)"
 .TP
 .BI "--custom " parameters
-Provide all required parameters to
-.B mindi
-for non-interactive calling. This usually means a call from
+.RI "Provide all required parameters to"
+.B mindi
+.RI "for non-interactive calling. This usually means a call from"
 .BR "mondoarchive(8)".
 The following parameters are used:
@@ -120 +125 @@
 .br
 19) make non-bootable [yes|no]
+.br
+20) use gzip [yes|no]
 .br
 (Blank parameters must be specified as "" on the command line.)
@@ -135 +142 @@
 reports.
 .TP
+.I /etc/mindi/deplist.d
+Files containing the list of files to be included on boot/root disks.
+.TP
 .I /etc/mindi/deplist.txt 
-List of files to be included on boot/root disks.
+List of additional files to be included on boot/root disks.
 .TP
 .I /var/cache/mindi/N.tar.gz
@@ -168 +178 @@
 called 
 .B mindi.conf 
-which overwrites default values by setting up the following variables:
-.TP 
-.I TMPDIR
-.B (default /tmp): directory to create temporary files
-.br
-.TP
-.I EXTRA_SPACE
-.B (default 24576): increase if you run out of ramdisk space
-.br
-.TP
-.I IA64_BOOT_SIZE
-.B (default 8192): size of the ia64 boot disk
-.br
-.TP
-.I CACHE_LOC
-.B (default /var/cache/mindi): directory where boot/root files 
-and iso are generated
-.br
-WARNING: This directory is erased before usage
+which overwrites default values described in
+.B mindi.conf.dist
+in the same directory.
 .br
 .SH "SEE ALSO"

trunk/mondo-doc/mondoarchive.8

@@ -135 +135 @@
 .B For experienced users only.
 
+.TP
+.BI "-U "
+Use a generic USB device as backup device. Use this if you want to write
+your backup to a USB key or USB disk, which will be make bootable.
+The USB device should be attached to the system ir order for this to work.
+.B WARNING: All the data on the related devices will be removed.
+
 .SH MAJOR OPTIONS
 .TP 13
@@ -170 +177 @@
 .TP
 .BI "-d " "dev|dir"
-Specify the backup device (CD/tape) or directory (NFS/ISO). For CD-R[W] drives,
+Specify the backup device (CD/tape/USB) or directory (NFS/ISO). For CD-R[W] drives,
 this is the SCSI node where the drive may be found, e.g. '0,1,0'. For tape
-users, this is the tape streamers /dev entry, e.g. '/dev/st0'. For ISO users,
+users, this is the tape streamers /dev entry, e.g. '/dev/st0'. For USB users,
+this is the device name of your key or external disk. For ISO users,
 this is the directory where the ISO images are stored. For NFS users, this is
 the directory within the NFS mount where the backups are stored. The default
@@ -240 +248 @@
 .BI "-F "
 Do not offer to write boot+data floppy disk images to 3.5-inch floppy disks.
-The images will remain in /root/images/mindi until your next backup run,
+The images will remain in /var/cache/mindi until your next backup run,
 however.
 
@@ -412 +420 @@
 .I "mondoarchive -Ow 4 -I \*(lq/home /etc\*(rq"
 
+.BI USB:
+Backup to your USB key, using gzip compression:
+.br
+.I "mondoarchive -OU -d /dev/sda -G"
+
 .BI NFS:
 Backup to an NFS mount:

trunk/mondo/INSTALL

@@ -13 +13 @@
 configure --with-maximum-noof-media=<big-number>. To make a statically
 linked mondorestore (not tested), configure --enable-static-mr.
-
 
 [original entry]

trunk/mondo/Makefile.am

@@ -2 +2 @@
 SUBDIRS        = src po
 man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8
-
 ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = config.rpath mkinstalldirs
-
-

trunk/mondo/bootstrap

@@ -1 +1 @@
 #!/bin/bash
+#
+# $Id$
 #
 # Built from scratch

trunk/mondo/configure.in

@@ -74 +74 @@
         AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
         PTHREAD="-lpthread"
-        CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+        CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_REENTRANT -Wshadow -funsigned-char -Wstrict-prototypes -Wunused -Winit-self -Wcast-align"
         ;;
     *)

trunk/mondo/distributions/rpm/mondo.spec

@@ -16 +16 @@
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires:  newt-devel >= 0.50
+BuildRequires:  newt-devel >= 0.50, gettext-devel
 ExcludeArch:    ppc
 OBS
-Requires:   mindi >= 1.2.1, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
+Requires:   mindi >= 1.2.1, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, gettext, DDD
 %ifarch ia64
 Requires:   elilo, parted

trunk/mondo/po/POTFILES.in

@@ -39 +39 @@
 src/common/newt-specific.h
 src/common/libmondo-tools.h
-src/common/libmondo-string.c
 src/common/libmondo-fork.h
 src/common/libmondo-files.h
 src/common/libmondo-filelist.c
-src/common/libmondo-string.h
 src/common/libmondo-raid.c
 src/common/libmondo-filelist.h
@@ -49 +47 @@
 src/common/libmondo-raid.h
 src/common/mondostructures.h
-src/common/libmondo-msg.c
 src/common/libmondo-archive.h
 src/common/libmondo-stream.c

trunk/mondo/src/common/Makefile.am

@@ +1 @@
+##
+## $Id$
 ##
 ## Process this file with Automake to generate `Makefile.in'

trunk/mondo/src/common/libmondo-archive.c

@@ -32 +32 @@
 #include "libmondo-verify-EXT.h"
 #include "libmondo-archive.h"
+
 #define DVDRWFORMAT 1
 
@@ -544 +545 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *command = NULL;
     char *use_lzo_sz = NULL;
@@ -786 +788 @@
         mr_asprintf(&value, "dvd");
         break;
+    case usb:
+        strcpy(value, "usb");
+        break;
     default:
         fatal_error("Unknown backup_media_type");
@@ -854 +859 @@
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
+    if (bkpinfo->backup_media_type == usb) {
+        asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+    } else {
+        asprintf(&tmp2,"");
+    }
+
     // Watch it! This next line adds a parameter...
     if (bkpinfo->nonbootable_backup) {
@@ -862 +873 @@
 
     mr_asprintf(&command,
-/*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
-6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
-11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-             "mindi --custom %s %s/images '%s' '%s' \
+            "mindi %s --custom '%s' '%s/images' '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", bkpinfo->tmpdir,  // parameter #2
-             bkpinfo->scratchdir,   // parameter #3
-             bkpinfo->kernel_path,  // parameter #4
-             tape_device,       // parameter #5
-             tape_size_sz,      // parameter #6
-             lines_in_filelist, // parameter #7 (INT)
-             use_lzo_sz,        // parameter #8
-             cd_recovery_sz,    // parameter #9
-             bkpinfo->image_devs,   // parameter #10
-             broken_bios_sz,    // parameter #11
-             last_filelist_number,  // parameter #12 (STRING)
-             estimated_total_noof_slices,   // parameter #13 (INT)
-             devs_to_exclude,   // 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)
-             tmp);
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", 
+            tmp2,
+            bkpinfo->tmpdir,        // parameter #2
+            bkpinfo->scratchdir,    // parameter #3
+            bkpinfo->kernel_path,   // parameter #4
+            tape_device,            // parameter #5
+            tape_size_sz,           // parameter #6
+            lines_in_filelist,      // parameter #7 (INT)
+            use_lzo_sz,             // parameter #8
+            cd_recovery_sz,         // parameter #9
+            bkpinfo->image_devs,    // parameter #10
+            broken_bios_sz,         // parameter #11
+            last_filelist_number,   // parameter #12 (STRING)
+            estimated_total_noof_slices,    // parameter #13 (INT)
+            devs_to_exclude,        // 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)
+            tmp);
     mr_free(tmp);
     mr_free(tape_size_sz);
@@ -899 +909 @@
     mr_free(use_lilo_sz);
     mr_free(use_gzip_sz);
+    mr_free(tmp2);
 
     log_msg(2, command);

trunk/mondo/src/common/libmondo-devices.c

@@ -1 @@
-/* 
- * $Id$
- * Subroutines for handling devices
- */
+/* libmondo-devices.c                 Subroutines for handling devices
+   $Id$
+*/
+
 /**
  * @file
@@ -1469 +1469 @@
     case cdrw:
     case dvd:
+    case usb:
         if (archiving_to_media) {
-            if (bkpinfo->backup_media_type != dvd) {
+            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
                 if (ask_me_yes_or_no
                     (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
@@ -1490 +1491 @@
                 mr_asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 log_msg(1, "Setting to DVD defaults");
+            } else if (bkpinfo->backup_media_type == usb) {
+                strcpy(bkpinfo->media_device, VANILLA_USB_DEVICE);
+                strcpy(sz_size, "512");
             } else {
                 mr_allocstr(bkpinfo->media_device,VANILLA_SCSI_CDROM );
@@ -1496 +1500 @@
                 log_msg(1, "Setting to CD defaults");
             }
-            if (bkpinfo->backup_media_type != dvd) {
+            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
                 if (!popup_and_get_string(_("Speed"), comment, tmp)) {
                     log_to_screen(_("User has chosen not to backup the PC"));

trunk/mondo/src/common/libmondo-fifo.c

@@ -1 +1 @@
 /* $Id$ */
-
 /**
  * @file

trunk/mondo/src/common/libmondo-fork.c

@@ -2 +2 @@
  * $Id$
  */
-
 #include "my-stuff.h"
 #include "mondostructures.h"

trunk/mondo/src/common/libmondo-raid.c

@@ -17 +17 @@
 #include "libmondo-raid.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 
 #ifdef __FreeBSD__

trunk/mondo/src/common/libmondo-tools.c

@@ -181 +181 @@
 
 /**
- * Locate mondoarchive's home directory. Searches in /usr/local/mondo, /usr/share/mondo,
+ * Locate mondoarchive's home directory. Searches in /usr/share/mondo,
  * /usr/local/share/mondo, /opt, or if all else fails, search /usr.
  *

trunk/mondo/src/common/libmondo-verify.c

@@ -1 +1 @@
 /* $Id$ */
-
 /**
  * @file

trunk/mondo/src/common/mondostructures.h

@@ -167 +167 @@
     nfs,                        ///< Back up to an NFS mount on the local subnet.
     tape,                       ///< Back up to tapes.
+    usb,                        ///< Back up to USB devices.
     udev                        ///< Back up to another unsupported device; just send a stream of bytes.
 } t_bkptype;
@@ -312 +313 @@
    * The device we're backing up to.
    * If backup_media_type is @b cdr, @b cdrw, or @b cdstream, this should be the SCSI node (e.g. 0,1,0).
-   * If backup_media_type is @b dvd, @b tape, or @b udev, this should be a /dev entry.
+   * If backup_media_type is @b dvd, @b tape, @b usb or @b udev, this should be a /dev entry.
    * If backup_media_type is anything else, this should be blank.
    */

trunk/mondo/src/include/my-stuff.h

@@ -126 +126 @@
 #define ARBITRARY_MAXIMUM 2000  ///< The maximum number of items showing at once in the mountlist or filelist editor.
 #define MAX_TAPECATALOG_ENTRIES 8192    ///< The maximum number of entries in the tape catalog.
-#define MAX_STR_LEN 380         ///< The maximum length of almost all @p char buffers in Mondo.
+#define MAX_STR_LEN 384         ///< The maximum length of almost all @p char buffers in Mondo.
+                                        ///  Note: Make this divisible by eight to avoid aligment issues
+                                        ///        on 64bit platforms like ia64.
 #define MAXIMUM_RAID_DEVS 32    ///< The maximum number of RAID devices in the raidlist.
 #define MAXIMUM_ADDITIONAL_RAID_VARS 32 ///< The maximum number of additional RAID variables per RAID device in the raidlist.

trunk/mondo/src/mondoarchive/Makefile.am

@@ +1 @@
+## $Id$
+##
 ## $Id$
 ##

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -216 +216 @@
     i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
         flag_set['t'] + flag_set['u'] + flag_set['r'] +
-        flag_set['w'] + flag_set['C'];
+        flag_set['w'] + flag_set['C'] + flag_set['U'];
     if (i == 0) {
         retval++;
@@ -404 +404 @@
     }
 
+    if (flag_set['U'])          // USB
+    {
+        if (! flag_set['d']) {
+            fatal_error
+                ("You need to specify a device file with -d for bootable USB device creation");
+        }
+        if (!flag_set['s']) {
+            fatal_error("You did not specify a size (-s) for your USB device. Aborting");
+        }
+    }
+
     if (flag_set['r'])          // DVD
     {
@@ -453 +464 @@
             }
         }
-    } else {                    /* CD size */
+    } else {                    /* CD|USB size */
         if (flag_set['s']) {
             if (process_the_s_switch(bkpinfo, flag_val['s'])) {
@@ -505 +516 @@
     if (flag_set['w']) {
         bkpinfo->backup_media_type = cdrw;
+    }
+    if (flag_set['U']) {
+        bkpinfo->backup_media_type = usb;
     }
     if (flag_set['z']) {
@@ -641 +655 @@
     }
 
-    if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
+    if (flag_set['d']) {        /* backup directory (if ISO/NFS/USB) */
         if (flag_set['i']) {
             mr_allocstr(bkpinfo->isodir,flag_val['d']);
@@ -653 +667 @@
             mr_allocstr(bkpinfo->nfs_remote_dir,flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-
             mr_allocstr(bkpinfo->media_device, flag_val['d']);
         }
@@ -673 +686 @@
 
     if (!flag_set['d']
-        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+        && (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['U'])) {
         if (g_kernel_version >= 2.6) {
             if (popup_and_get_string
@@ -902 +915 @@
     while ((opt =
             getopt(argc, argv,
-                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
+                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
            != -1) {
         if (opt == '?') {

trunk/mondo/src/mondorestore/Makefile.am

@@ +1 @@
+## $Id$
+##
 ## $Id$
 ##
 ## Process with Automake to generate Makefile.in
 ##
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
 
 AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include

trunk/mondo/src/mondorestore/mondo-restore.c

@@ -1 +1 @@
 /***************************************************************************
- * $Id$
- */
+$Id$
+restores mondoarchive data
+***************************************************************************/
 
 /**
@@ -2156 +2157 @@
             mr_free(tarball_fname);
             mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",
+                current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
                     current_tarball_number);
         }

trunk/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -9 +9 @@
 void kill_petris(void);
 int mount_cdrom(struct s_bkpinfo *bkpinfo);
+int mount_device(char *, char *, char *, bool);
 int mount_all_devices(struct mountlist_itself *, bool);
 void protect_against_braindead_sysadmins(void);

trunk/mondo/src/test/mktest

@@ -6 +6 @@
 #
 
-gcc -O2 -I../common -I../lib test-conf.c ../lib/mr_conf.c ../common/libmondo-msg.c -o test-conf
-gcc -O2 -I../common -I../lib test-string.c ../lib/mr_str.c -o test-string
+lib="../lib/mr_conf.c ../lib/mr_msg.c ../lib/mr_err.c ../lib/mr_mem.c"
+OPT="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_REENTRANT -Wstrict-prototypes -Wshadow -funsigned-char -Wunused -Winit-self -Wcast-align -O2 -g -I../common -I../include"
 
-for f in "test-conf"; do
+echo "Generating test-msg"
+gcc $OPT test-msg.c $lib -o test-msg
+echo "Generating test-string"
+gcc $OPT test-string.c ../lib/mr_str.c $lib -o test-string
+echo "Generating test-conf"
+gcc $OPT test-conf.c $lib -o test-conf
+
+echo "Testing against previous run"
+for f in test-conf test-string test-msg; do
     chmod 755 $f
     ./$f > /tmp/$f.res
@@ -16 +24 @@
         echo "$f test KO !!"
     fi
+    valgrind -q --error-exitcode=1 --leak-check=yes ./$f 2>&1 > /tmp/valgrind-$f.res
+    if [ $? -ne 0 ]; then
+        echo "valgrind $f test KO !!"
+    fi
 done

trunk/mondo/src/test/mondo.conf

@@ -5 +5 @@
 # Test conf file for mondo
 testfalse = TRUE
+# For msg tests
+logfile = "/tmp/mondo-test.log"
+loglevel = 3

trunk/mondo/src/test/test-conf.c

@@ -7 +7 @@
 
 #include <stdio.h>
-#include "my-stuff.h"
+#include <stdlib.h>
+
 #include "mr_conf.h"
 #include "mr_mem.h"
@@ -14 +15 @@
 int g_buffer_pid = 0;
 
-main() {
+int main(void) {
     int ret = 0;
     int i = 0;

trunk/mondo/src/test/test-conf.res

@@ -1 +1 @@
 Integer : ***3***
 Float : ***32.670000***
-String : ***"The big string"***
+String : ***The big string***

trunk/mondo/src/test/test-string.c

@@ -6 +6 @@
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "my-stuff.h"
 #include "mr_str.h"
 #include "mr_mem.h"
 
-main() {
+int main(void) {
     const char delims[3] = ": \n";
     
@@ -31 +29 @@
     }
     mr_free(string);
+
     exit(0);
 }

trunk/mondo/src/test/test-string.res

@@ -6 +6 @@
 token=|hda1[0]|, lastpos=28
 token=|hda12[3]|, lastpos=37
-token=|hda6[2]]|, lastpos=45
-token=|hda5[1]]|, lastpos=53
+token=|hda6[2]|, lastpos=45
+token=|hda5[1]|, lastpos=53

trunk/tools/build2pkg

@@ -56 +56 @@
     pv=`basename $src .tar.gz`
     PVER=`echo $pv | sed "s|^$p-||" | cut -d- -f1`
+
+    if [ _"$p" = _"mindi" ]; then
+        # Copy FindDistroFailsafe if it makes sense for that distro
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/FindDistroFailsafe 2> /dev/null
+        ln $p-${PVER}/distributions/${ddir}-$dver/FindDistroFailsafe $p-${PVER} 2> /dev/null
+    fi
 
     if [  _"$dtype" = _"rpm" ]; then

trunk/tools/distro-env

@@ -29 +29 @@
         elif grep -q CentOS /etc/redhat-release ; then
             export ddir="centos"
-            export dver=`awk '{print $3}' /etc/redhat-release`
+            export dver=`awk '{print $3}' /etc/redhat-release | cut -d. -f1`
         else
             export ddir="redhat"

trunk/tools/mval

@@ -1 @@
-valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes
+valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes $*

trunk/tools/quality

@@ -31 +31 @@
     echo "monodrescue $s usage : "
     tot=0
-    for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
+    for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|mindi-busybox' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
             echo " === $i"
             ((tot=$tot+`echo $i | cut -d: -f2`))
@@ -40 +40 @@
 echo " "
 echo "Qualimetry: "
-find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | xargs grep -r asprintf | egrep -v '/\*' | egrep -v 'asprintf\(&' > /tmp/mondo.quality
+find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -r asprintf | egrep -v '/\*' | egrep -v 'asprintf\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
 echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` asprintf without &"
-find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | xargs grep -r getline | egrep -v '/\*' | egrep -v 'getline\(&' > /tmp/mondo.quality
+find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -r getline | egrep -v '/\*' | egrep -v 'getline\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
 echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` getline without &"

trunk/tools/svn2build

@@ -80 +80 @@
                 exit -1
             fi
-            echo "Using $inc customization to build SPEC file"
 
             $TOOLHOME/mkchangelog.pl $dtype $p $MONDOTMP/$p.spec

trunk/website/docs.shtml

@@ -13 +13 @@
     <h2>Mondo Rescue HOWTO</h2>
   </div>
+  <p>The Mondo Rescue FAQ is available on our wiki:</p>
+  <ul>
+          <li>A <a href="http://trac.mondorescue.org/wiki/FAQ" target="_blank">Mondo Rescue FAQ</a> page.</li>
+  </ul>
+  Consult it before asking questions on the mailing list. Please read as well the following docs.
   <p>The Mondo Rescue HOWTO is available under various formats:</p>
   <ul>