Changeset 3147 in MondoRescue for branches/3.1/mindi

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

Location:

branches/3.1/mindi

Files:

• COPYING (modified) (2 diffs)
• README.ProLiant (modified) (2 diffs)
• README.bootparam (modified) (3 diffs)
• README.ia64 (modified) (2 diffs)
• README.obdr (copied) (copied from branches/3.0/mindi/README.obdr )
• README.pxe (modified) (4 diffs)
• analyze-my-lvm (modified) (11 diffs)
• deplist.d/ProLiant.conf (modified) (1 diff)
• deplist.d/addon.conf (modified) (1 diff)
• deplist.d/base.conf (modified) (1 diff)
• deplist.d/fs.conf (modified) (4 diffs)
• deplist.d/minimal.conf (modified) (6 diffs)
• deplist.d/net.conf (modified) (1 diff)
• deplist.d/udev.conf (copied) (copied from branches/3.0/mindi/deplist.d/udev.conf )
• install.sh (modified) (4 diffs)
• mindi (modified) (124 diffs)
• mindi-bkphw (modified) (6 diffs)
• mindi-get-perl-modules (modified) (4 diffs)
• mindi.conf (modified) (1 diff)
• mr-net-find (copied) (copied from branches/3.0/mindi/mr-net-find )
• parted2fdisk.pl (modified) (1 diff)
• rootfs/etc/init.d/rcS (modified) (20 diffs)
• rootfs/etc/inittab (copied) (copied from branches/3.0/mindi/rootfs/etc/inittab )
• rootfs/etc/passwd (modified) (1 diff)
• rootfs/sbin/start-netfs (modified) (1 diff)
• udev.files (deleted)

branches/3.1/mindi/COPYING

@@ -3 +3 @@
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+               51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -283 +283 @@
 
              END OF TERMS AND CONDITIONS
+
+
+    Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

branches/3.1/mindi/README.ProLiant

@@ -1 +1 @@
 $Id$
+
+MondoRescue provides enhanced HP ProLiant support.
+
+HP ProLiant provides the possibility to be configured from a HW perspective at BIOS, Smart Arry (Raid) and iLO (management board) level from a Linux system.
+
+The information is stored in the EEPROM of each HW component (BIOS, SA and iLO), retrieved through the below mentioned HP tools, and stored on the disk with XML files. These files are available at restore time, to be used by the same tools, also available, to reconfigure the HW in a similar way to what it was at backup time.                                                                                                                                        
+                                                                                                                                                           
+Only if you add FirmWare components under /usr/local/bin (CPxxx.scexe files) then these files will also be launched at restore time to force a specific FW version to be installed. As long as FirmWare files are not stored under /usr/local/bin, they won't be applied.                                                                                                                                                   
+At restore time, MondoRescue will ask a question (if not in unattended mode) in order to know if you want to restore the HW *configuration* (not HW FirmWare) content. It will then re-apply what was stored in the XML files to configure the platform exactly as it was at backup time, from a HW confiuration perspective.
 
 -------------------------------------------------------------------------------------
 
+If you have a ProLiant system you first need to get the hp-scripting-tools, hponcfg and hpacucli packages. Due to licenses issues, mindi cannot provide those tools itself. You need to get them from http://downloads.linux.hp.com/SDR
+
+Example for a RHEL6 OS:
+
+wget http://downloads.linux.hp.com/SDR/downloads/bootstrap.sh
+sh ./bootstrap.sh SPP
+sh ./bootstrap.sh Extras
+yum install -y hpacucli hponcfg hp-scripting-tools
+
+You're now ready to check your configuration by running:
+mindi-bkphw /var/cache/mindi /etc/mindi
+[First parameter is the directory where files will be generated,
+ Second parameter is the configuration directory of the file deplist.d/ProLiant.conf is located]
+
+-------------------------------------------------------------------------------------
+Older method:
+
 If you have a ProLiant system you first need to get the hp-scripting-tools, hponcfg and hpacucli packages. Due to licenses issues, mindi cannot provide those tools itself. You need to get them from http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/
+
+Example for a RHEL6 OS:
 
 wget http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/RedHat/6Server/x86_64/8.72/hpacucli-8.70-8.0.noarch.rpm
@@ -13 +41 @@
 wget http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/RedHat/6Server/i386/8.72/hp-scripting-tools-8.70-52.rhel6.i386.rpm
 yum install -y (or worst case rpm -Uvh) hp-scripting-tools-8.70-52.rhel6.i386.rpm
-(will install hp-conrep under /sbin)
+(will install hp-conrep or hp-rcu under /sbin)
 
 You're now ready to check your configuration by running:

branches/3.1/mindi/README.bootparam

@@ -28 +28 @@
 
 excludedevs="dev1 dev2"
-    Exclude those evices from retoration process (no LVM action done suc has pvcreate, and no partitioning. Those devices are removed from /var/cache/mindi/mountlist.txt and /var/cache/mindi/i-want-my-lvm)
+    Exclude those devices from restoration process (no LVM action done such as pvcreate, and no partitioning. Those devices are removed from /var/cache/mindi/mountlist.txt and /var/cache/mindi/i-want-my-lvm)
 
 forcemods="mod1 mod2"
@@ -60 +60 @@
     Call mondorestore with -o and the tape device
 
+obdrmods="mod1 mod2"
+    Remove these modules in order to be able to reset the tape dvice using it and place it in sequential mode. A default list of modules is aloready embedded so this should only be used if the list is unsufficient. Please report that usage to dev team.
+
 pre=/path/to/script
     Execute a pre-configuration script before calling mondorestore. Could be an NFS shared script e.g., or a script located in the initrd. Eg: pre=/tmp/isodir/my-pre.sh. Note that the script should be executable.
@@ -70 +73 @@
 
 serial=/dev/ttySx
-    When using a serial console, associate it to the tty device so it works correctly at restore time. By default set up /dev/ttyS0 as serial console. Pass the value of your serial console if different.
+    When using a serial console, associate it to the tty device so it works correctly at restore time. By default set up /dev/ttyS0 as serial console. Pass the value of your serial console if different. You may also want to pass console=ttySx so your kernel can deal with it. serial takes precedence over console for mindi.
 
 textonly

branches/3.1/mindi/README.ia64

@@ -5 +5 @@
 So a perl script called parted2fdisk.pl was written that will take as input all the order that mindi/mondo pass to fdisk, translate them to be given to parted and print the result in fdisk format. So this is a filter allowing fdisk replacement. It's only used on ia64. On other archs, parted2fdisk is a link to fdisk.
 
-Thus mindi/mondo launched by root will pass all their call to parted2fdisk instead of the real fdisk, and be able to support the GPT format. It will call fdisk and parted for its work.
-
-To get it on the system to restore, please do the following as root:
-
-make -f Makefile.parted2fdisk
-make -f Makefile.parted2fdisk install
-mv rootfs/sbin/parted2fdisk-ia64 rootfs/sbin/parted2fdisk
-
-This will produce a binary version that will be used by mondorestore during the restoration process on ia64 to handle the GPT format. (Note again that on ia32 parte2fdisk is in fact a link to fdisk to avoid any compatibility issue)
+Thus mindi/mondorestore commands launched by root will pass all their call to parted2fdisk on ia64 instead of the real fdisk, and be able to support the GPT format. It will call fdisk and parted for its work.  (Note again that on ia32 parte2fdisk is in fact a link to fdisk to avoid any compatibility issue)
 
 The install.sh script will setup everything correctly for you.
@@ -21 +13 @@
 On Itanium systems you won't generally find an installed isolinux.bin file which is required by mindi to create the bootable images. You'll generally have to take an i386 package for your distribution and install it on your itanium system so that you provide the required missing file.
 
-On SLES 10, fdisk is nor provided anymore. You'll have to rebuild the util-linux package by desactivating fdisk removal in the spec file. 
+On SLES 10, fdisk is not provided anymore. You'll have to rebuild the util-linux package by desactivating fdisk removal in the spec file. 
 
 Please report any problem around that tool to bruno@mondorescue.org
 Bruno.
 
+2013-06-08 no binary made anymore, only perl scripts
 2005-12-12 parted2fdisk used everywhere
 2005-03-23 Explain compilation and backup/restore split

branches/3.1/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [hwaddr=M:A:C:A:D:R] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 selinux=0 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs|smbfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [hwaddr=M:A:C:A:D:R] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)
@@ -20 +20 @@
 dhcp is a keyword. Using it will provide all the previous 4 values to activate the LAN interface.
 hwaddr is the MAC address of the device you want to use to restore through
-proto is the protocol to use for mounting the remote share (default is NFS, sshfs is also available)
+proto is the protocol to use for mounting the remote share (default is NFS, sshfs and smbfs are also available)
 server is the ip addr of the Remote Network server
 mountpoint is the mount point on the Remote Network server to use (if NFS, should be in /etc/exports of the NFS server)
@@ -27 +27 @@
 netfspath is the local path on the remote server where the image is located, if different from the one at backup time.
 local_path is the local directory under which the mage was made (with the -d option)
-rmadisk_size may have to be increase to 131072 on more recent distributions such as rhel 5
+rmadisk_size may have to be increase to 262144 or more on more recent distributions such as RHEL 6
 The [] mean this parameter is optional
 The () mean that you have a choice with the '|' meaning 'or'
@@ -49 +49 @@
 CAVEAT: the limit to the number of char on the append line is 255. Use symlinks to reduce the size of your path if needed.
 
+NOTE: If you don't have selinux=0 on the boot line, you may have issues restoring extended attributes on your filesystem and thus be unable to log on at next reboot after restore.
+
 Please report any problem around that tool to bruno_at_mondorescue.org
 

branches/3.1/mindi/analyze-my-lvm

@@ -13 +13 @@
 GetValueFromField() {
     local res
-    sed s/'    '/~/ "$1" | tr -s ' ' ' ' | sed s/'~ '/'~'/ | grep -i "$2~" | cut -d'~' -f2,3,4,5 | tr '~' ' ' | gawk '{ if ($2=="MB") {printf "%dm",$1;} else if ($2=="MiB") {printf "%dm",$1;} else if ($2=="KB") {printf "%dk",$1;} else if ($2=="KiB") {printf "%dk",$1;} else if ($2=="GB") {printf "%fg",$1;} else if ($2=="GiB") {printf "%fg",$1;} else if ($2=="TB") {printf "%dt",$1;} else if ($2=="TiB") {printf "%dt",$1;} else {print $0;};}'
+    grep -i "$2" "$1" | perl -pi -e 's/\s*(.*)\s\s\s+(.+)$/$2/;s/\sT[i]*B/t/;s/\sG[i]*B/g/;s/\sM[i]*B/m/;s/\sK[i]*B/k/'
 }
 
@@ -54 +54 @@
     # Exclude LVs member of that env var
     if [ "$MINDI_EXCLUDE_DEVS" ] ; then
-        list_of_devices="`mindi --readalllink $LV_full_string`"
+        list_of_devices="`mindi --nolog --readalllink $LV_full_string 2> /dev/null`"
         l=""
         for d in $list_of_devices; do
@@ -84 +84 @@
     device=$1
     output=""
-    $LVMCMD lvdisplay $device > $fname
+    $LVMCMD lvdisplay $device | cat > $fname
     stripes=`GetValueFromField $fname "Stripes"`
     stripesize=`GetValueFromField $fname "Stripe size (MByte)"`m
@@ -90 +90 @@
     [ "$stripesize" = "k" ] && stripesize=""
     allocation=`GetValueFromField $fname "LV Size"`
-    [ ! "`echo "$allocation" | grep "[k,m,g]"`" ] && allocation="$allocation"m
+    [ ! "`echo "$allocation" | grep "[k,m,g,t]"`" ] && allocation="$allocation"m
     if echo "$allocation" | grep -E '^.*g$' > /dev/null 2> /dev/null ; then
         val=`echo "$allocation" | sed s/g//`
@@ -127 +127 @@
 
 
-
-
 ProcessVolumeGroup() {
     local current_VG physical_volumes i list_of_devices VG_params
@@ -152 +150 @@
         # If multipath check which type of devide are given, mpath prefered
         for d in $list_of_devices; do
-            l="$l `mindi --readalllink $d`"
+            l="$l `mindi --nolog --readalllink $d 2> /dev/null`"
             l="$l `GiveMapperOfdm $d`"
         done
@@ -184 +182 @@
         skip=0
         l=""
-        l="$l `mindi --readalllink $d`"
+        l="$l `mindi --nolog --readalllink $d 2> /dev/null`"
         l="$l `GiveMapperOfdm $d`"
         list_of_devices="`echo $l | sort -u`"
@@ -207 +205 @@
             for d in `cat $MINDI_TMP/pv.tmp2`; do
                 skip=0
-                l="$l `mindi --readalllink $d`"
+                l="$l `mindi --nolog --readalllink $d 2> /dev/null`"
                 l="$l `GiveMapperOfdm $d`"
                 list_of_devices="`echo $l | sort -u`"
@@ -239 +237 @@
 GiveMapperOfdm () {
 
-major=`stat -c "%t" $1 2> /dev/null`
-minor=`stat -c "%T" $1 2> /dev/null`
+major=`stat -L -c "%t" $1 2> /dev/null`
+minor=`stat -L -c "%T" $1 2> /dev/null`
 
 for i in `ls /dev/mapper/*`; do
-    mj=`stat -c "%t" $i`
-    mn=`stat -c "%T" $i`
+    mj=`stat -L -c "%t" $i`
+    mn=`stat -L -c "%T" $i`
     if [ "$mj" = "$major" ] && [ "$mn" = "$minor" ]; then
         echo "$i"
         return
     fi
+done
+echo $1
+}
+
+GiveVGLVOfdm () {
+
+major=`stat -L -c "%t" $1 2> /dev/null`
+minor=`stat -L -c "%T" $1 2> /dev/null`
+
+for v in `vgs --noheadings | awk '{print $1}'`; do
+    for i in `ls /dev/$v/*`; do
+        mj=`stat -L -c "%t" $i`
+        mn=`stat -L -c "%T" $i`
+        if [ "$mj" = "$major" ] && [ "$mn" = "$minor" ]; then
+            echo "$i"
+            return
+        fi
+    done
 done
 echo $1
@@ -292 +308 @@
 
 ListAllLogicalVolumesSortedBydm() {
-        for d in `ListAllLogicalVolumes` ; do
-            dm=`mindi --readalllink $d | tail -1`
-            echo "$dm|$d" >> $MINDI_TMP/sorteddm
-        done
-        sort -t'|' $MINDI_TMP/sorteddm | cut -d'|' -f2
+    rm -f $MINDI_TMP/sorteddm
+    for d in `ListAllLogicalVolumes` ; do
+        dm=`mindi --nolog --readalllink $d 2> /dev/null | tail -1`
+        echo "$dm|$d" >> $MINDI_TMP/sorteddm
+    done
+    if [ -f $MINDI_TMP/sorteddm ]; then
+        cut -d'-' -f2- $MINDI_TMP/sorteddm | sort -t'|' -n | cut -d'|' -f2
+    fi
 }
 
@@ -333 +352 @@
 # -------------------------------- main -----------------------------------
 
+# These exports are needed to avoid bad formating of display commands (, instead of . for separator e.g.)
+# Fix #654
+export LANG=C
+export LANGUAGE=C
+
 if [ "$1" = "--givemapperofdm" ] ; then
     shift
     if [ _"$1" != _"" ] ; then
         GiveMapperOfdm $1
+    fi
+    exit 0
+fi
+
+if [ "$1" = "--givevglvofdm" ] ; then
+    shift
+    if [ _"$1" != _"" ] ; then
+        GiveVGLVOfdm $1
     fi
     exit 0

branches/3.1/mindi/deplist.d/ProLiant.conf

@@ -10 +10 @@
 # XML file under /opt/hp/hp-scripting-tools/etc/conrep.xml
 /sbin/hp-conrep
+/sbin/hp-rcu
+/sbin/hp-fm
 
 # Previous method

branches/3.1/mindi/deplist.d/addon.conf

@@ -4 +4 @@
 #
 /usr/games/petris
+/usr/bin/nano

branches/3.1/mindi/deplist.d/base.conf

@@ -77 +77 @@
 /usr/bin/head
 /usr/bin/less
-# On ArchLinux
-/bin/less
+
 /usr/bin/sort
 /usr/bin/uniq

branches/3.1/mindi/deplist.d/fs.conf

@@ -5 +5 @@
 /sbin/mkfs
 /sbin/mkswap
+/sbin/swaplabel
 /sbin/mke2fs
 /sbin/mkfs.ext2
@@ -20 +21 @@
 /sbin/mkfs.minix
 /sbin/mkfs.ocfs2
+/sbin/mkfs.btrfs
 
 #
@@ -34 +36 @@
 /sbin/fsck.jfs
 /sbin/badblocks
+/sbin/btrfsck
 
-# ext2/3
+# ext2/3/4
 #
 /sbin/e2label
+/sbin/e4label
 /sbin/tune2fs
+/sbin/tune4fs
 /etc/mke2fs.conf
 
@@ -53 +58 @@
 /sbin/make_reiser4
 /sbin/measurefs.reiser4
+
+#
+# BTRFS
+#
+/sbin/btrfs
+/sbin/btrfs-convert
+/sbin/btrfsctl
+/sbin/btrfs-debug-tree
+/sbin/btrfs-image
+/sbin/btrfs-map-logical
+/sbin/btrfs-show
+/sbin/btrfstune
+/sbin/btrfs-vol
+/sbin/btrfs-zero-log
 
 #

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

@@ -9 +9 @@
 # Used by init
 /bin/sh
+/bin/bash
+/bin/mt
 /bin/awk
 /usr/bin/awk
@@ -77 +79 @@
 /lib/libnss_files.so.2
 /sbin/shutdown
+/etc/init.d/functions
+/etc/init.d/functions
+/etc/rc.d/functions
+/usr/bin/grep
 
 # Compression
@@ -84 +90 @@
 /sbin/klogd
 /sbin/syslogd
+/sbin/rsyslogd
 # On ArchLinux
 /usr/sbin/syslog-ng
@@ -94 +101 @@
 /bin/mount
 /sbin/losetup
+/sbin/mount.nfs
+/sbin/mount.nfs4 
+/etc/rpc
+/etc/netconfig
+/usr/bin/sshfs 
+/sbin/mount.fuse
+/usr/bin/fusermount
+# On ArchLinux
+/bin/fusermount
+/usr/bin/ssh
+# Required by ssh as dlopened
+/lib/libnss_compat.so
+/usr/lib/libnss_compat.so
+/usr/lib64/libnss_compat.so
+/lib/libnss_compat.so.2
+/usr/lib/libnss_compat.so.2
+/usr/lib64/libnss_compat.so.2
+/lib/libnss_files.so
+/usr/lib/libnss_files.so
+/usr/lib64/libnss_files.so
+/lib/libnss_files.so.2
+/usr/lib/libnss_files.so.2
+/usr/lib64/libnss_files.so.2
+/etc/ssh
+/usr/bin/ulockmgr_server
+#On ArchLinux
+/bin/ulockmgr_server
+/sbin/mount.cifs
+/sbin/mount.cifs3
+/sbin/mount.smb
+/sbin/mount.smb3
+/sbin/mount.smbfs
+/sbin/mount.smbfs3
 /sbin/mount.ntfs
 /sbin/mount.ntfs-3g
 /sbin/fstab-decode
 
-# For udev/devfs
+# For devfs
 /sbin/MAKEDEV
-/etc/init.d/functions
 # On ArchLinux
 /etc/rc.d/functions
 /etc/services
 /sbin/devfsd
-/etc/udev
-/etc/hotplug.d
-/sbin/udev.static
-/sbin/udevsend
-/sbin/udevd
 /sbin/hwup
 /sbin/path_id
@@ -129 +163 @@
 /sbin/hwup
 
+/sbin/usb_id
+/sbin/vol_id
+/sbin/pam_console_apply
+
+# For upstart/systemd
+/etc/init
+/sbin/start
+/sbin/stop
+/sbin/status
+/sbin/shutdown
+/sbin/initctl
+
 # Modules
 /sbin/insmod
 /sbin/lsmod
-# On ArchLinux
+/sbin/kmod
+# On SLES 11 SP2
 /bin/lsmod
+# On ArchLinux
+/usr/bin/lsmod
+/usr/bin/insmod
+/usr/bin/kmod
 /sbin/modprobe
 /etc/modprobe.d
@@ -168 +219 @@
 # Not completely mandatory
 /usr/bin/tty
+# Network System Tools
+/bin/ping
+/sbin/ifconfig
+/sbin/route
+/sbin/rpcbind
+
+# Busybox
+/usr/lib/mindi/rootfs/bin/busybox
+/usr/lib64/mindi/rootfs/bin/busybox

branches/3.1/mindi/deplist.d/net.conf

@@ -10 +10 @@
 /usr/bin/scp
 
+# DHCP
+/sbin/dhclient
+/sbin/dhclient-script
+/var/lib/dhcp/dhclient.leases
+/var/lib/dhclient/dhclient.leases
+/var/lib/dhclient
+# On ArchLinnux
+/usr/sbin/dhcpcd
+/var/lib/dhcpd
+
 # Useful for debug
 /usr/sbin/ethtool

branches/3.1/mindi/install.sh

@@ -40 +40 @@
 MINDIVER=PBVER
 MINDIREV=PBREV
+VERSTR=${MINDIVER}-r${MINDIREV}
 ARCH=`/bin/uname -m`
-echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
+echo "mindi $VERSTR will be installed under $local"
 
 if [ _"$MINDI_CACHE" = _"" ]; then
@@ -78 +79 @@
     install -m 644 $f $conf/deplist.d
 done
-for f in mindi-bkphw mindi-get-perl-modules parted2fdisk.pl; do
-    install -m 755 $f $local/sbin
-done
 
 # Substitute variables for 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
-
+chmod 755 $local/sbin/mindi
 install -m 644 mindi.8 $MANDIR
 #install -m 644 ChangeLog COPYING README README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
+
+# Manage perl script man pages
+for s in mindi-bkphw mindi-get-perl-modules parted2fdisk.pl; do
+    install -m 755 $s $local/sbin
+    pod2man -c "$s a MondoRescue tool" --section=8 --release="$VERSTR" $local/sbin/$s > $s.8
+    install -m 644 $s.8 $MANDIR
+    # Generate the list of perl modules needed at restore time for mindi
+    cat > $conf/perl-scripts << EOF
+$sublocal/sbin/$s
+EOF
+done
+(cd $MANDIR ; ln -s parted2fdisk.pl.8 parted2fdisk.9)
+
+if [ "_$PREFIX" = "_" ] && [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
+    echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
+fi
 
 # Managing parted2fdisk
@@ -96 +109 @@
 else
     # FHS requires fdisk under /sbin
-    (cd $local/sbin && ln -sf /sbin/fdisk parted2fdisk)
+    (cd $local/sbin && ln -sf ../../sbin/fdisk parted2fdisk)
     echo "Symlinking fdisk to parted2fdisk"
     ( cd $localdata/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
@@ -109 +122 @@
 fi
 
-# Generate the list of perl modules needed at restore time for mindi
-cat > $conf/perl-scripts << EOF
-$sublocal/sbin/mindi-get-perl-modules
-$sublocal/sbin/mindi-bkphw
-$sublocal/sbin/parted2fdisk.pl
-EOF
-
 exit 0

branches/3.1/mindi/mindi

@@ -21 +21 @@
 # In case of problem with udev you can try to add udevdebug
 MINDI_ADDITIONAL_BOOT_PARAMS="devfs=nomount noresume selinux=0 barrier=off udevtimeout=10"
+MINDI_DEFAULT_BOOT_OPTION="interactive"
+# For a CD Recovery use 10000 instead rather. Beware till Hardcoded below. Planned to be changed on the perl version
+# So this parameter only applies to non CD recovery.
+MINDI_BOOT_TIMEOUT="300"
 
 MINDI_REV=PBREV
@@ -35 +39 @@
 TMPDIR=/tmp
 
-EXTRA_SPACE=80152       # increase if you run out of ramdisk space
-BOOT_SIZE=36864         # size of the boot disk
+EXTRA_SPACE=120000      # increase if you run out of ramdisk space
+BOOT_SIZE=65600         # size of the boot disk
 
 PROMPT_MAKE_CD_IMAGE="yes"
@@ -58 +62 @@
 MY_FSTAB=/etc/fstab
 TAPE_MODS="ht st osst ide-tape ide_tape"
-SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc hpsa 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 iscsi_tcp libiscsi scsi_transport_iscsi libiscsi_tcp isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp dc395x diskdumplib scsi_dump_register arcmsr"
+SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc hpsa 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 be2iscsi cxgb3i cxgb3 cxgb4i cxgb4 libcxgbi iscsi_boot_sysfs iscsi_target_mod iscsi_tcp libiscsi libiscsi2 scsi_transport_iscsi scsi_transport_iscsi2 libiscsi_tcp uio isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp scsi_dh_emc scsi_dh_alua dc395x diskdumplib scsi_dump_register arcmsr"
 
 # ide-probe-mod
-IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs ide-core ide_core ide-gd_mod ide_gd_mod edd paride ata_generic ide_pci_generic ata_piix libata dock via82cxxx generic nvidia ahci libahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw blkbk virtio virtio_ring virtio_pci virtio_blk virtio_balloon"
+IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs ide-core ide_core ide-gd_mod ide_gd_mod edd paride ata_generic ide_pci_generic ata_piix libata dock via82cxxx generic nvidia ahci libahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw blkbk virtio virtio_ring virtio_pci virtio_blk virtio_balloon"
 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 xhci usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
-NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse libcrc32c crc32c netbk xenblktap r8169 virtio_net"
+USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_common usb-common usb_storage input hid hid_generic uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd xhci usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
+NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 cnic be2net 8021q bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse crc32c libcrc32c netbk xenblktap r8169 virtio_net via_rhine garp"
 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 vfat fat"
 # Those modules will only go on the backup media, not the boot media.
-EXTRA_MODS="$CDROM_MODS loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 raid6_pq async_pq xor async_tx async_memcpy async_xor lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin dm-emc dm-hp-sw dm-rdac dm-region-hash dm-snapshot dm-log multipath jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 ocfs2 ocfs2_dlm ocfs2_nodemanager configfs"
+EXTRA_MODS="$CDROM_MODS loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 raid6_pq async_pq xor async_tx async_memcpy async_xor lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin dm-emc dm-hp-sw dm-rdac dm-region-hash dm-snapshot dm-log multipath jfs xfs btrfs zlib_deflate xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 ocfs2 ocfs2_dlm ocfs2_nodemanager configfs vxodm vxgms vxglm gab llt dmpaa vxspec vxio vxdmp vxportal fdd vxfs "
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
-DENY_MODS="kqemu"
+DENY_MODS="kqemu vxfen"
 # Force some modules to be included
 FORCE_MODS=""
@@ -118 +122 @@
 fi
 
+
+# Function to log on screen only
+LogScreen() {
+    if [ -e /dev/stderr ] ; then
+        echo -e "$1" >> /dev/stderr
+    elif [ -e /usr/bin/logger ] ; then
+        /usr/bin/logger -s $1
+    fi
+}
+
+# Function to log in log file only
+LogFile() {
+
+    echo -e "$1" >> $LOGFILE
+    if [ _"$2" != _"" ]; then
+        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
+    fi
+    rm -f "$2"
+}
+
+# Function to log in both screen and logfile
+LogAll() {
+    LogScreen "$1"
+    LogFile "$1" "$2"
+}
+
+# Preserved for compatibility
+LogIt() {
+    LogAll "$1" "$2"
+}
+
 # Last function called before exiting
 # Parameter is exit code value
@@ -126 +161 @@
     if [ _"$MONDO_SHARE" != _"" ] ; then
         echo "------------- mindi logfile included -------------------------" >> /var/log/mondoarchive.log
-        cat $LOGFILE >> /var/log/mondoarchive.log
+        if [ -f $LOGFILE ]; then
+            cat $LOGFILE >> /var/log/mondoarchive.log
+        else
+            echo "No LOGFILE available in that mindi run"  >> /var/log/mondoarchive.log
+        fi
         echo "--------------------------------------------------------------">> /var/log/mondoarchive.log
     fi
@@ -139 +178 @@
     exit $1
 }
-
-LogOnly() {
-    echo -e "$1" >> $LOGFILE
-    if [ _"$2" != _"" ]; then
-        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
-    fi
-    rm -f "$2"
-}
-
-# Function to log on screen only
-LogScreen() {
-    if [ -e /dev/stderr ] ; then
-        echo -e "$1" >> /dev/stderr
-    elif [ -e /usr/bin/logger ] ; then
-        /usr/bin/logger -s $1
-    fi
-}
-
-# Function to log in log file only
-LogFile() {
-
-    echo -e "$1" >> $LOGFILE
-    if [ _"$2" != _"" ]; then
-        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
-    fi
-    rm -f "$2"
-}
-
-# Function to log in both screen and logfile
-LogAll() {
-    LogScreen "$1"
-    LogFile "$1" "$2"
-}
-
-# Preserved for compatibility
-LogIt() {
-    LogAll "$1" "$2"
-}
-
 
 Die() {
@@ -239 +239 @@
     [ "$KBDEPTH" -gt "128" ] && Die "Edit $MINDI_SBIN/mindi and disable FindAndAddUserKeyboardMappingFile (line 2160, approx.)"
     if [ -e "$bigdir/$mappath" ] ; then
-        LogFile "$mappath already added" 
+        LogFile "INFO: $mappath already added"
         return
     elif [ -d "$bigdir/$mappath" ] ; then
@@ -245 +245 @@
         return
     fi
-    LogFile "Added kbd map $mappath" 
+    LogFile "INFO: Added kbd map $mappath"
     if [ ! -e "$mappath" ] ; then
         mappath=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
         if [ ! -e "$mappath" ] ; then
-            LogAll "Cannot add $mappath: kbd map file not found"
+            LogAll "WARNING: Cannot add $mappath: kbd map file not found"
             return
         fi
+    else
+        echo -en "`basename $mappath | tr '.' '#' | sed s/#kmap#gz// | sed s/#inc#gz//` " | tr '#' '.'
     fi
 
@@ -257 +259 @@
     mkdir -p $bigdir/etc
     # TODO: why not use the cp.lis here ?
-    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
+    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "WARNING: AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
-        included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
+        included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'//g | cut -d' ' -f2`
     else
-        included_list=`grep -Fi include $mappath | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
+        included_list=`grep -Fi include $mappath | sed s/'"'//g | cut -d' ' -f2`
     fi
     for included_item in $included_list ; do
@@ -278 +280 @@
 
 CopyDependenciesToDirectory() {
-    local outdir incoming fname counter d found
+    local outdir incoming counter d found tdir
     outdir=$1
-    noof_lines=$2
     mkdir -p $outdir
     incoming=`ReadLine`
-    progress=0
+    counter=0
     while [ "$incoming" != "" ] ; do
         # Non absolute file names should not arrive till here => skipped
         if [ `echo "$incoming" | cut -c1` != '/' ]; then
-            LogAll "Unable to handle $incoming"
+            LogAll "WARNING: Unable to handle $incoming"
             incoming=`ReadLine`
             continue
@@ -298 +299 @@
             d=`dirname "$d"`
         done
-        if [ -d "$incoming" ] && [ ! -h "$incoming" ]; then
+        if [ -d "$incoming" ]; then
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir 0
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
-            tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
-
+            if [ ! -h "$incoming" ]; then
+                tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
+            else
+                tdir=`dirname "$incoming"`
+                if [ ! -e "$outdir/$tdir" ]; then
+                    mkdir -p "$outdir/$tdir"
+                fi
+                cp --no-dereference --preserve=all $incoming "$outdir/$tdir"
+            fi
             # Only uncompress modules if not using udevd
             if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
-                gunzip -f $outdir/$incoming || LogAll "Cannot gunzip $outdir/$incoming"
-            fi
-            [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
-            progress=$(($progress+1))
-            LogProgress $progress $noof_lines
+                gunzip -f $outdir/$incoming || LogAll "WARNING: Cannot gunzip $outdir/$incoming"
+            fi
+            [ -x "$outdir" ] && StripExecutable $outdir
+            counter=$(($counter+1))
+            LogProgress $counter $2
         fi
         incoming=`ReadLine`
@@ -326 +334 @@
 
 
-
 DropOptimizedLibraries() {
-    local outdir filelist list_of_optimized_libraries optimized_lib_name vanilla_lib_name reason msg resolved res progress
+    local outdir filelist list_of_optimized_libraries optimized_lib_name vanilla_lib_name reason msg resolved res
     filelist=$1
     outdir=$2
 
-    progress=0
     list_of_optimized_libraries=`grep "lib/i[5-7]86/" $filelist`
     if [ "$list_of_optimized_libraries" = "" ] ; then
         return 0
-    else
-        noof_lines=`echo $list_of_optimized_libraries | tr ' ' '\n' | wc -l`
     fi
     echo -en "Dropping i686-optimized libraries if appropriate"
     for optimized_lib_name in $list_of_optimized_libraries ; do
+        echo -en "."
         reason=""
         vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
         echo "$vanilla_lib_name" >> $filelist
-        LogFile "Adding $vanilla_lib_name to filelist" 
+        LogFile "INFO: Adding $vanilla_lib_name to filelist"
         mkdir -p $outdir$optimized_lib_name > /dev/null 2> /dev/null
         rmdir $outdir$optimized_lib_name > /dev/null 2> /dev/null
@@ -350 +355 @@
         # This may return multiple files
         for resolved in `ReadAllLink $vanilla_lib_name`; do
-            LogFile "Adding as deps $resolved to filelist" 
+            LogFile "INFO: Adding as deps $resolved to filelist"
             vanilla_resolved_name=`echo "$resolved" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
             if [ "$vanilla_resolved_name" != "$resolved" ]; then
@@ -356 +361 @@
                 rmdir $outdir$resolved > /dev/null 2> /dev/null
                 ln -sf $vanilla_resolved_name $outdir$resolved
-                LogFile "Excluding deps $resolved" 
+                LogFile "INFO: Excluding deps $resolved" 
                 grep -Fvx "$resolved" "$filelist" > $filelist.tmp
-                LogFile "Replacing it with $vanilla_resolved_name" 
+                LogFile "INFO: Replacing it with $vanilla_resolved_name" 
                 echo "$vanilla_resolved_name" >> $filelist.tmp
                 mv -f $filelist.tmp $filelist
             fi
         done
-        progress=$(($progress+1))
-        LogProgress $progress $noof_lines
     done
     $AWK '{ print $1; }' $filelist | sort -u > $filelist.tmp
@@ -374 +377 @@
 FindAndAddUserKeyboardMappingFile() {
     local r res mapfile mappath included_item included_list keyfile mp locale
-    LogFile "Analyzing your keyboard's configuration."
+    LogAll "INFO: Analyzing your keyboard's configuration."
     KEYDIR=/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
@@ -382 +385 @@
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
     if [ ! -e "$KEYDIR" ] ; then
-        LogAll "Keyboard mapping directory not found. I shall use default map at boot-time."
+        LogAll "WARNING: Keyboard mapping directory not found. I shall use default map at boot-time."
         return 0
     fi
-    LogFile "Adding the following keyboard mapping tables: "
     if [ -e "/etc/sysconfig/keyboard" ] ; then
-        LogFile "Red Hat-style config detected." 
+        LogFile "INFO: Red Hat-style config detected."
         keyfile=/etc/sysconfig/keyboard
     elif [ -e "/etc/rc.d/rc.keymap" ] ; then
-        LogFile "Slackware-style config detected." 
+        LogFile "INFO: Slackware-style config detected."
         keyfile=/etc/rc.d/rc.keymap
     elif [ -e "/etc/rc.config" ] ; then
-        LogFile "Debian-style config detected." 
+        LogFile "INFO: Debian-style config detected."
         keyfile=/etc/rc.config
     elif [ -e "/etc/console/boottime.kmap.gz" ] ; then
-        LogFile "Debian-style config detected." 
+        LogFile "INFO: Debian-style config detected."
         mkdir -p $bigdir/tmp
         echo "/etc/console/boottime.kmap.gz" > $MINDI_CACHE/KEYMAP-LIVES-HERE
@@ -406 +408 @@
         return 0
     elif [ -e "/etc/console-setup/boottime.kmap.gz" ] || [ -e "/etc/console-setup/cached.kmap.gz" ] ; then
-        LogFile "Ubuntu-style config detected." 
+        LogFile "INFO: Ubuntu-style config detected."
         mkdir -p $bigdir/tmp
         if [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
@@ -421 +423 @@
         return 0
     elif [ -e "/etc/rc.conf" ] ; then
-        echo "ArchLinux config detected." >> $LOGFILE
+        LogFile "INFO: ArchLinux config detected."
         keyfile=/etc/rc.conf
     elif [ -e "/etc/conf.d/keymaps" ] ; then
-        LogFile "Gentoo-style config detected." 
+        LogFile "INFO: Gentoo-style config detected."
         keyfile=/etc/conf.d/keymaps
     else
-        LogAll "Searching for rc.config ..."
+        LogFile "Searching for rc.config ..."
         keyfile=`find /etc -name rc.config | head -n1`
         if [ "$keyfile" = "" ] || [ ! -e "$keyfile" ] ; then
-            LogAll "Unknown config detected. Default keyboard map will be used."
+            LogAll "WARNING: Unknown config detected. Default keyboard map will be used."
             return
         else
-            LogFile "Found $keyfile" 
+            LogFile "INFO: Found $keyfile"
         fi
     fi
     if [ ! -e "$KEYDIR/keymaps" ] ; then
-        LogAll "Keyboard mapping directory not found. Default keyboard map will be used."
+        LogAll "WARNING: Keyboard mapping directory not found. Default keyboard map will be used."
         return
     fi
-    LogFile "keyfile=$keyfile" 
-    locale=`grep -F KEYTABLE "$keyfile" | tr -d '"' |cut -d'=' -f2`
+    LogFile "INFO: keyfile=$keyfile"
+    # For SLES we need to remove the .map.gz extension Cf #614
+    locale=`grep -F KEYTABLE "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2 | sed 's/.map.gz$//'`
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
-    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | tr -d '"' |cut -d'=' -f2`        # Gentoo & ArchLinux
-    LogFile "locale=$locale" 
+    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo & ArchLinux
+    LogFile "INFO: locale=$locale"
     #
     # Process the keymaps dir once for all
@@ -455 +458 @@
     echo "$mp" | grep -q " " >> $LOGFILE
     if [ $? -eq 0 ]; then
-        LogAll "WARNING: Multiple keymaps found: $mp" 
-        LogFile "The following one will be used" 
+        LogAll "WARNING: Multiple keymaps found: $mp"
+        LogFile "INFO: The following one will be used"
     fi
     for i in $mp ; do
@@ -463 +466 @@
     done
     if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
-            mappath=$(find / -name "*/kbd/keymaps/*/$locale")
-    fi
-    LogFile "mappath = $mappath" 
+        mappath=$(find / -wholename "*/kbd/keymaps/*/$locale | head -1")
+    fi
+    LogFile "INFO: mappath = $mappath"
     if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
-        LogAll "Keyboard mapping file not found. Default keyboard map will be used."
+        LogAll "WARNING: Keyboard mapping file not found. Default keyboard map will be used."
         return
     fi
+    LogAll "INFO: Adding the following keyboard mapping tables: "
     mkdir -p $bigdir/tmp
     echo "$mappath" > $MINDI_CACHE/KEYMAP-LIVES-HERE
@@ -490 +494 @@
     [ ! -e "$MBOOTC32" ] && MBOOTC32=`find / -name mboot.c32 | grep -x "/.*/mboot.c32"`
     [ ! -e "$MBOOTC32" ] && Die "Please install mboot.c32 first. If your syslinux RPM doesn't include mboot.c32, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.org/downloads.shtml"
-    LogFile "Found mboot.c32 at $MBOOTC32"
+    LogFile "INFO: Found mboot.c32 at $MBOOTC32"
 }
 
@@ -502 +506 @@
     [ ! -e "$ISOLINUX" ] && ISOLINUX=`find / -name isolinux.bin | grep -x "/.*/isolinux.bin"`
     [ ! -e "$ISOLINUX" ] && Die "Please install isolinux first. If your syslinux RPM doesn't include isolinux, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.org/downloads.shtml"
-    LogFile "Found isolinux.bin at $ISOLINUX" 
+    LogFile "INFO: Found isolinux.bin at $ISOLINUX"
 }
 
@@ -510 +514 @@
 
     if [ ! -e "$1" ] ; then
-        LogAll "WARNING - cannot search specific path '$1'"
+        LogAll "WARNING: cannot search specific path '$1'"
         return 1
     fi
     # Find all files and links (required for some VMWare VMs)
-    modpaths=`find "$1" -name $2.*o -o -name $2.o.gz -o -name $2.ko.gz -o -name $2 -type f -o -type l`
+    modpaths=`find "$1" -name $2.*o -o -name $2.o.gz -o -name $2.ko.gz -o -name $2.ko.xz -o -name $2 -type f -o -type l`
     echo "$modpaths"
 }
@@ -541 +545 @@
         filelist=`GenerateListForFile "$incoming"`
         r=$?
-        [ "$r" -ne "0" ] && LogAll "$incoming not found"
+        [ "$r" -ne "0" ] && LogAll "WARNING: $incoming not found"
         res=$(($res+$r))
-#       LogFile "'$incoming' generates filelist '$filelist'"
+#       LogFile "INFO: '$incoming' generates filelist '$filelist'"
         for fname in $filelist ; do
             [ "$fname" != "" ] && echo "$fname" >> $tempfile
@@ -610 +614 @@
     progress=0
     noof_lines=`cat $tempfile | wc -l`
-    LogFile "---------------------------------" 
-    LogFile "List of dependencies:             " 
-    LogFile "---------------------------------" 
+    LogFile "---------------------------------"
+    LogFile "List of dependencies:             "
+    LogFile "---------------------------------"
     for fname in `cat $tempfile` ; do
         echo "$fname" | tee -a $LOGFILE >> $outfile.pre
@@ -624 +628 @@
         mkdir -p $bigdir/bin
         if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
-            LogAll "\nIncorporating post-nuke tarball"
+            LogAll "\nINFO: Incorporating post-nuke tarball"
             old_pwd=`pwd`
             cd "$bigdir"
-            tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log || LogAll "Error occurred when untarring post-nuke tarball" $MINDI_TMP/$$.log
+            tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log || LogAll "ERROR: when untarring post-nuke tarball" $MINDI_TMP/$$.log
             cd "$old_pwd"
         fi
-        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogAll "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
+        if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin 2>> $LOGFILE ; then
+            LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
+        else
+            LogIt "ERROR: Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP"
+            LogIt "       I bet you've got a spare copy of Mondo or Mindi floating around on your system."
+            LogIt "       If Mindi was called by Mondo then send me a bug report."
+            LogIt "       It not, type 'ps ax' to see which Mondo-related process is still running then kill it. :-)"
+            LogIt "       Finally, run Mindi again."
+            Die "Odd."
+        fi
+        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogIt "\nINFO: Mondo v1.2x defaults to LILO as the bootloader, BTW."
         if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
-            LogAll "\nIncorporating NFS-related settings"
-            for r in NETFS-* ; do
+            LogAll "\nINFO: Incorporating Network-related settings"
+            for r in NETFS-* ISO-PREFIX ; do
                 cp -f $MINDI_TMP/$r $bigdir/tmp 2>> $LOGFILE || Die "Cannot copy $r - did you run out of disk space?"
-                LogFile "Copying $r to ramdisk" 
+                LogFile "INFO: Copying $r to ramdisk"
             done
         fi
@@ -693 +707 @@
     local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
     local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
-    local lcMagicInitfs="<6>checking if image is initramfs...|<6>Unpacking initramfs...|<6>Trying to unpack rootfs image as
-initramfs"
+    local lcMagicInitfs="<6>checking if image is initramfs...|<6>Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
 
     # local variables
@@ -702 +715 @@
 
     # say where we are.
-    LogFile "  GetInitrdFilesystemToUse(): called with parameter: $lvKernelImage" 
+    LogFile "INFO: GetInitrdFilesystemToUse(): called with parameter: $lvKernelImage"
 
     # verify that file exists
     [ ! -f $lvKernelImage ] && Die "File $lvKernelImage not found. Terminating."
 
-    # Kernel may be gzip compressed
+    # Kernel may be gzip compressed - Case of RHEL5 - SLES11SP1
     file $lvKernelImage 2>&1 | grep -q gzip
     if [ $? -eq 0 ]; then
-        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
-
-        # determine which filesystem to use for initrd image: ext2|3fs, gzip'ed cpio (initramfs) or cramfs
-        if [ `echo $lvScanRes | grep -Ec "$lcMagicExt2fs"` -eq 1 ]; then
-            lvUseFilesystem="ext2fs"
-        elif [ `echo $lvScanRes | grep -Ec "$lcMagicExt3fs"` -eq 1 ]; then
-            lvUseFilesystem="ext3fs"
-        elif [ `echo $lvScanRes | grep -Ec "$lcMagicInitfs"` -eq 1 ]; then
-            lvUseFilesystem="initramfs"
-        elif [ `echo $lvScanRes | grep -Ec "$lcMagicCramfs"` -eq 1 ]; then
-            lvUseFilesystem="cramfs"
+        LogFile "INFO: Found a gzip compressed kernel $lvKernelImage"
+        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs" 2> /dev/null`
+    else
+        LogFile "INFO: Found a non gzip compressed kernel $lvKernelImage"
+        # kernel is x86 boot sector in RHEL3/4 with embedded gzip content
+        # get offet of gzip magic "1f8b0800" in file (for these older kernels)
+        lvOffset=`od -vA n -t x1 $lvKernelImage | tr -d '[:space:]' | awk '{ print match($0, "1f8b0800")}' 2> /dev/null`
+        if [ $lvOffset -eq 0 ]; then
+            LogFile "INFO: gzip magic not found in file $lvKernelImage. Supposing initramfs."
+            lvScanRes=$lcMagicInitfs
         else
-            lvUseFilesystem="UNSUPPORTED"
-        fi
-
+            lvOffset=`expr $lvOffset / 2`
+            LogFile "INFO: GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset."
+            # scan again  kernel image
+            lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs" 2> /dev/null`
+        fi
+    fi
+
+    # determine which filesystem to use for initrd image: ext2|3fs, gzip'ed cpio (initramfs) or cramfs
+    if [ `echo $lvScanRes | grep -Ec "$lcMagicExt2fs"` -eq 1 ]; then
+        lvUseFilesystem="ext2fs"
+    elif [ `echo $lvScanRes | grep -Ec "$lcMagicExt3fs"` -eq 1 ]; then
+        lvUseFilesystem="ext3fs"
+    elif [ `echo $lvScanRes | grep -Ec "$lcMagicInitfs"` -eq 1 ]; then
+        lvUseFilesystem="initramfs"
+    elif [ `echo $lvScanRes | grep -Ec "$lcMagicCramfs"` -eq 1 ]; then
+        lvUseFilesystem="cramfs"
     else
-        # In that case, we are after 2.6.30 and use the supported initramfs 
+        # In that case, we are most probably after 2.6.30 and use the supported initramfs 
+        LogFile "No automatic detection found previously. Supposing initramfs."
+        LogFile "Report on the MondoRescue mailing-list withyour log files"
         lvUseFilesystem="initramfs"
     fi
+
     # say what we are using
-    LogFile "  GetInitrdFilesystemToUse(): Filesytem to use for initial ramdisk is $lvUseFilesystem." 
+    LogFile "INFO: GetInitrdFilesystemToUse(): Filesytem to use for initial ram disk is $lvUseFilesystem."
 
     # return file system to use
@@ -804 +832 @@
         r=`find /lib/modules/$kern -type f | grep "/${module}\..*o" | tail -n1`
         if [ -z "$r" ]; then
-            echo "$MODULES" | grep -wq $module
-            if [ $? -ne 0 ]; then
+            if [ "`echo "$MODULES" | grep -w $module`" ]; then
                 r="[live module file not found]"
             else
@@ -813 +840 @@
             [ -f "$r" ] && echo "$r" >> $outfile
         fi
-        LogFile "module $module --> $r" 
-        [ -f "$r" ] && echo "$r" >> $outfile
+        LogFile "INFO: module $module --> $r"
         progress=$(($progress+1))
         LogProgress $progress $noof_lines
@@ -830 +856 @@
     for fname in $incoming ; do
         if [ ! -e "$fname" ] ; then
-            LogFile "WARNING - $fname does not exist; cannot be LDD'd." 
+            LogFile "WARNING: $fname does not exist; cannot be LDD'd."
             if echo $fname | grep lvm &> /dev/null ; then
-                LogFile "This warning only affects you if you are using LVM." 
+                LogFile "          This warning only affects you if you are using LVM."
                 if echo "$MODULES" | grep lvm &> /dev/null ; then
-                    LogFile "I think you are, so please take heed!" 
+                    LogFile "          I think you are, so please take heed!"
                 else
-                    LogFile "I don't think you are, so don't worry about it." 
+                    LogFile "          I don't think you are, so don't worry about it."
                 fi
             fi
         elif [ -h "$fname" ] && [ -x "$fname" ] ; then
-            LogFile "$fname is softlink" 
+            LogFile "INFO: $fname is softlink"
         else
             ldd $fname 2> /dev/null | ProcessLDD
@@ -850 +876 @@
 # Give all symlinks recursively of a full path name
 ReadAllLink() {
-
-    incoming="$*"
-
-    for file in $incoming ; do
-        if [ ! -f $file ]; then
-            continue
-        fi
-        echo "$file"
-        if [ ! -h $file ]; then
-            continue
-        fi
-    
-        link=`readlink $file`
-        d=`dirname $file`
-        fchar=`echo $link | cut -c1`
-        # If mother dir is a link print it
-        if [ -h "$d" ]; then
-            echo "$d"
-            d=`readlink $d`
-        fi
-        if [ "$fchar" != "/" ]; then
-            # Relative or local link
-            ReadAllLink "$d/$link" 
-        else
-            # Absolute path
-            ReadAllLink $link 
-        fi
-    done
+    file="$1"
+
+    while [ `echo $file | grep -Ec '\.\./'` -ne 0 ]; do
+        # We need to normalise the path with .. in it
+        file=`echo $file | perl -pi -e 's|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g'`
+    done
+    echo "$file"
+    if [ ! -h $file ]; then
+        return 0
+    fi
+
+    link=`readlink $file`
+    d=`dirname $file`
+    fchar=`echo $link | cut -c1`
+    # If mother dir is a link print it
+    if [ -h "$d" ]; then
+        echo "$d"
+        d=`readlink $d`
+    fi
+    if [ "$fchar" != "/" ]; then
+        # Relative or local link
+        ReadAllLink "$d/$link" 
+    else
+        # Absolute path
+        ReadAllLink $link 
+    fi
 }
 
@@ -933 +957 @@
 }
 
-# Function to log on screen only
-LogScreen() {
-    if [ -e /dev/stderr ] ; then
-        echo -e "$1" >> /dev/stderr
-    elif [ -e /usr/bin/logger ] ; then
-        /usr/bin/logger -s $1
-    fi
-}
-
-# Function to log in log file only
-LogFile() {
-
-    echo -e "$1" >> $LOGFILE
-    if [ _"$2" != _"" ]; then
-        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
-    fi
-    rm -f "$2"
-}
-
-# Function to log in both screen and logfile
-LogAll() {
-    LogScreen "$1"
-    LogFile "$1" "$2"
-}
-
 # Called by TurnTgzIntoRdz, to make mondorestore.cfg
 MakeMondoConfigFile() {
@@ -963 +962 @@
     outfile=$1
     > $outfile
-    [ "$BACKUP_MEDIA_TYPE" ]        && echo "backup-media-type $BACKUP_MEDIA_TYPE" >> $outfile
     [ "$TAPESIZE" ]     && echo "media-size $TAPESIZE" >> $outfile
     [ "$TAPEDEV" ]          && echo "media-dev $TAPEDEV" >> $outfile
@@ -978 +976 @@
     echo "use-lzo $use_lzo" >> $outfile
     echo "use-gzip $use_gzip" >> $outfile
+    echo "use-star $use_star" >> $outfile
     echo "use-lzma $use_lzma" >> $outfile
     echo "use-comp $use_comp" >> $outfile
-    echo "use-star $use_star" >> $outfile
     echo "use-udev $use_udev" >> $outfile
     echo "datestamp `date`" >> $outfile
     [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-DEV           netfs-dev           $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-PROTO         netfs-proto           $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-IPADDR netfs-client-ipaddr $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-NETMASK netfs-client-netmask $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-BROADCAST netfs-client-broadcast $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-HWADDR netfs-client-hwaddr $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-DEFGW  netfs-client-defgw  $outfile
     AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-MOUNT  netfs-server-mount  $outfile
     AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-USER  netfs-server-user  $outfile
     AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-PATH   netfs-server-path   $outfile
     AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-IPADDR netfs-server-ipaddr $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-PROTO         netfs-proto           $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-DEV           netfs-dev           $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-IPADDR netfs-client-ipaddr $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-NETMASK netfs-client-netmask $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-BROADCAST netfs-client-broadcast $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-DEFGW  netfs-client-defgw  $outfile
     AddFileToCfgIfExists $MINDI_TMP/ISO-DEV           iso-dev           $outfile
     AddFileToCfgIfExists $MINDI_TMP/ISO-MNT           iso-mnt           $outfile
@@ -1000 +999 @@
     AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
     AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.NAME   bootloader.name   $outfile
+    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.VER    bootloader.ver   $outfile
+    AddFileToCfgIfExists $MINDI_TMP/KEYMAP-LIVES-HERE keymap-lives-here $outfile
     AddFileToCfgIfExists $MINDI_TMP/TAPEDEV-HAS-DATA-DISKS tapedev-has-data-disks $outfile
+    AddFileToCfgIfExists $MINDI_TMP/BACKUP-MEDIA-TYPE backup-media-type $outfile
+    AddFileToCfgIfExists $MINDI_TMP/DIFFERENTIAL      differential      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ACL      acl      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/XATTR      xattr      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/OBDR      obdr      $outfile
 }
 
@@ -1021 +1027 @@
 absolute_partition old_partition_fmt current_lvolume uname skip
 
-    LogFile "------------------------------------" 
-    LogFile "Your raw fstab file looks like this:" 
-    LogFile "------------------------------------" 
+    LogFile "------------------------------------"
+    LogFile "Your raw fstab file looks like this:"
+    LogFile "------------------------------------"
     cat $MY_FSTAB >> $LOGFILE
-    LogAll "-----------------------------------" 
-    LogAll "Your mountlist will look like this:" 
-    LogAll "-----------------------------------" 
+    LogAll "-----------------------------------"
+    LogAll "Your mountlist will look like this:"
+    LogAll "-----------------------------------"
 
 # mountlist(OUT)
@@ -1042 +1048 @@
     
     if [ $LVM != "false" ]; then
-        LogFile "Analyzing LVM..."
+        LogAll "INFO: Analyzing LVM..."
         $MINDI_DATA/analyze-my-lvm > $MINDI_TMP/lvm.res
         if [ $? -ne 0 ]; then
@@ -1055 +1061 @@
     done
     [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
-    printf "%-15s %-15s %-15s %s %s\n" DEVICE MOUNTPOINT FORMAT "SIZE MB" LABEL/UUID | tee -a $LOGFILE
-    printf "%-15s %-15s %-15s %s %s\n" ------ ---------- ------  -------  ---------- | tee -a $LOGFILE
+    printf "%-15s %-15s %-15s %-13s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE MB" LABEL/UUID | tee -a $LOGFILE
+    printf "%-15s %-15s %-15s %-13s %-15s\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 tmpfs devpts sysfs proc debugfs"
     for c_p in $all_partitions ; do
@@ -1064 +1070 @@
         if [ -h "$c_p" ] && [ "`echo "$c_p" | grep -F "/dev/hd"`" = "" ] && [ "`echo "$c_p" | grep -F "/dev/sd"`" = "" ] && [ "`echo "$c_p" | grep -F "/dev/md"`" = "" ] ; then
             current_partition=`readlink -f $c_p`
-            [ "`echo "$current_partition" | grep -F "/dev/mapper"`" != "" ] && current_partition="$c_p"
+            if [ "`echo "$current_partition" | grep -F "/dev/mapper"`" != "" ]; then
+                current_partition="$c_p"
+            elif [ "`echo $current_partition | grep -E '^/dev/dm-'`" ]; then
+                # For SLES 11 type of distro, do not use dm devices as they are unable to be handled by lvm commands
+                current_partition=`$MINDI_LIB/analyze-my-lvm --givevglvofdm $current_partition`
+            fi
             [ "`echo "$useless_dev" | grep -F "$current_partition"`" ] && continue
         else
@@ -1074 +1085 @@
         uuid=""
         absolute_partition=`readlink -f $c_p`
-        partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
-
-        # Detects noauto partitions not mounted and exclude them
-        partition_option=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $4}' | head -n1`
-        if [ "`echo "$partition_option" | grep -i noauto`" != "" ] && [ "`mount | grep -w "$partition_mountpt"`" =  "" ] ; then
-            continue
-        fi
+        partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
 
         # set default in case we dont't find it
@@ -1087 +1092 @@
         # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
         # current_partition contains only first column of /etc/fstab
-        if [ "`echo "$current_partition" | /bin/grep -i "LABEL="`" != "" ]; then
+        if [ "`echo "$current_partition" | grep -i "LABEL="`" != "" ]; then
             redhat_label=`echo "$current_partition" | cut -d'=' -f2`
             actual_dev=""
@@ -1098 +1103 @@
             # 2nd try : blkid, the good way for all LABEL except swap
             if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
-                actual_dev=`/sbin/blkid | /bin/grep "$redhat_label" | grep LABEL= | cut -d':' -f1`
+                actual_dev=`/sbin/blkid | grep "$redhat_label" | grep LABEL= | cut -d':' -f1`
                 # For LVM FS it will give a /dev/dm-# which should then be converted
                 if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
@@ -1117 +1122 @@
             # For LVM gives a /dev/mapper entry 
             if [ "x$actual_dev" = "x" ]; then
-                actual_dev=`/bin/mount -l | /bin/grep "\[$redhat_label\]" | cut -d' ' -f1`
+                actual_dev=`/bin/mount -l | grep "\[$redhat_label\]" | cut -d' ' -f1`
             fi
     
@@ -1123 +1128 @@
             # SWAP only
             if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
-                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | $AWK '{ print $1 }' `
+                list_swaps=`cat /proc/swaps | grep "/dev/" | $AWK '{ print $1 }' `
                 for dev_swap in $list_swaps ; do
-                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"`
+                    dev_exists=`/sbin/vol_id $dev_swap | grep "$redhat_label"`
                     if [ "x$dev_exists" != "x" ]; then
                         actual_dev=$dev_swap
@@ -1137 +1142 @@
             # or could be a string that isn't a complete device name (eg. LABEL =SWAP-cciss/c0d0p)
             # SWAP only
-            if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -iE 'LABEL=SWAP|LABEL=SW-'`" != _"" ]; then
+            if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | grep -iE 'LABEL=SWAP|LABEL=SW-'`" != _"" ]; then
                     skip=""
                     uname=$KERVERRUN
@@ -1168 +1173 @@
         # This part tries to retrieve the correct device from a UUID line in /etc/fstab
         # current_partition contains only first column of /etc/fstab
-        elif [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
+        elif [ "`echo "$current_partition" | grep -i "UUID="`" != "" ]; then
             uuid=`echo "$current_partition" | cut -d'=' -f2`
             actual_dev=""
@@ -1179 +1184 @@
             # 2nd try : blkid, the good way for all UUID except swap
             if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
-                actual_dev=`/sbin/blkid | /bin/grep "$uuid" | grep UUID= | cut -d':' -f1`
+                actual_dev=`/sbin/blkid | grep "$uuid" | grep UUID= | cut -d':' -f1`
                 # For LVM FS it will give a /dev/dm-# which should then be converted
                 if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
@@ -1197 +1202 @@
             # 3th try, with vol_id 
             if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
-                list_dev=`mount | /bin/grep -E '^/' | $AWK '{ print $1 }' `
+                list_dev=`mount | grep -E '^/' | $AWK '{ print $1 }' `
                 for dev in $list_dev ; do
-                    dev_exists=`/sbin/vol_id $dev | /bin/grep "$uuid"`
+                    dev_exists=`/sbin/vol_id $dev | grep "$uuid"`
                     if [ "x$dev_exists" != "x" ]; then
                         actual_dev=$dev
@@ -1209 +1214 @@
             # 4th try, with dumpuuid (VMWare only ?) for swap
             if [ "x$actual_dev" = "x" -a -x "/sbin/dumpuuid" ]; then
-                list_dev=`cat /proc/swaps | /bin/grep -E '^/' | $AWK '{ print $1 }' `
+                list_dev=`cat /proc/swaps | grep -E '^/' | $AWK '{ print $1 }' `
                 for dev in $list_dev ; do
-                    dev_exists=`/sbin/dumpuuid $dev | /bin/grep "$uuid"`
+                    dev_exists=`/sbin/dumpuuid $dev | grep "$uuid"`
                     if [ "x$dev_exists" != "x" ]; then
                         actual_dev=$dev
@@ -1230 +1235 @@
             if [ _"$partition_mountpt" = _"" ]; then
                 # set default in case we dont't find it
-                for tmpp in `tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -Ev "^#" | $AWK '{print $1}'`; do
-                        if [ _"`readlink -f $tmpp`" = _"$current_partition" ]; then
+                for tmpp in `tr -s '\t' ' ' < $MY_FSTAB | grep -Ev "^#" | $AWK '{print $1}'`; do
+                        if [ _"`readlink -f $tmpp`" = _"`readlink -f $current_partition`" ]; then
                             str_to_find_fmt_with=$tmpp
-                            partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$tmpp" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
+                            partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$tmpp" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
                             break;
                         fi
                 done
             fi
+        fi
+
+        # Detects noauto partitions not mounted and exclude them
+        partition_option=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$str_to_find_fmt_with" | grep -vx " *#.*" | $AWK '{print $4}' | head -n1`
+        if [ "`echo "$partition_option" | grep -i noauto`" != "" ] && [ "`mount | grep -w "$partition_mountpt"`" =  "" ] ; then
+                LogFile "INFO: Excluding $current_partition from mountlist (due to noauto option in fstab)"
+            continue
+        fi
+        # Detects bind partitions and exclude them
+        if [ "`echo "$partition_option" | grep -iw bind`" != "" ]; then
+                LogFile "INFO: Excluding $current_partition from mountlist (due to bind option in fstab)"
+            continue
         fi
 
@@ -1257 +1274 @@
             for d in `echo $MINDI_EXCLUDE_DEVS | sed 's/|/ /g'`; do
                 if  [ "`echo " $list_of_devices " | grep " $d"`" != "" ]; then
-                    echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
+                    LogFile "INFO: Excluding $current_partition from mountlist (due to excluded device $d)"
                     skip=1
                     continue
@@ -1268 +1285 @@
 
         partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
+        # Detects iso9660 ISO images and exclude them
+        if [ "`echo "$partition_format" | grep -iw iso9660`" != "" ]; then
+                LogFile "INFO: Excluding $current_partition from mountlist (due to iso9660 format in fstab)"
+            continue
+        fi
         # Some distributions such as Debian do not put /dev/<VG>/<LV> in fstab
         # for LVM partitions but use /dev/mapper/<VG>-<LV> instead. Fortunately,
@@ -1280 +1302 @@
         # into any of the LVM tools if possible.
 
-        current_lvolume="$current_partition"
+        current_lvolume="$current_partition"
         if [ $LVM = "v2" ] && [ "`echo $current_partition | grep -E '^/dev/mapper/'`" ]; then
             # .static dir are a Debian specificity
@@ -1286 +1308 @@
             echo $current_lvolume | grep -q ' '
             if [ $? -eq 0 ]; then
-                LogFile "WARNING: Multiple Logical Volumes found. Report to dev team" 
+                LogFile "WARNING: Multiple Logical Volumes found. Report to dev team"
             fi
             # if it's not found, it may well be a real device such as a multipath one
@@ -1301 +1323 @@
             partition_size="lvm"
         else
-            partition_size=`SizeOfPartition $current_partition`
             [ "`echo "$current_partition" | grep "[0-9]"`" = "" ] && continue
             [ "`echo "$current_partition" | grep -c "^/"`" -ne "1" ] && continue
             if [ "$partition_format" = "swap" ] || [ "$partition_mountpt" = "swap" ] ; then
+                # Skip swap files
+                [ "`echo "$current_partition" | grep -E "^/dev"`" = "" ] && continue
                 partition_size=`grep -Fv "Priority" /proc/swaps | tr -s '\t' ' ' | grep -F "$current_partition " | $AWK '{print $3}'`
                 [ "$partition_mountpt" != "swap" ] && partition_mountpt="swap"
@@ -1317 +1340 @@
                     [ "$items" -gt "0" ] && partition_size=$(($totalsize/$items)) || partition_size=0
                     [ "$partition_size" -lt "125000" ] && partition_size=125000
-                    LogFile "I'm guessing $c_p is $(($partition_size/1024))MB" 
+                    LogFile "INFO: I'm guessing $c_p is $(($partition_size/1024))MB"
                 fi
+            else
+                partition_size=`SizeOfPartition $current_partition`
             fi
         fi
@@ -1335 +1360 @@
         fi
         psz=$partition_size
-        LogFile "Examining $current_partition (mount=$partition_mountpt fmt=$partition_format psz=$psz)" 
+        LogFile "INFO: Examining $current_partition (mount=$partition_mountpt fmt=$partition_format psz=$psz)"
         [ "$psz" != "lvm" ] && psz=$(($psz/1024))
         if [ "`echo " $IMAGE_DEVS " | grep -F " $current_partition "`" != "" ] ; then
@@ -1343 +1368 @@
             partition_size=$(($partition_size+1)); # just in case
             if [ "$partition_format" = "Linux" ] ; then
-                LogFile "Are you imaging a mounted swap partition? Silly..." 
-                LogFile "Reverting format from $old_partition_fmt to $partition_format" 
+                LogFile "WARNING: Are you imaging a mounted swap partition? Silly..."
+                LogFile "WARNING: Reverting format from $old_partition_fmt to $partition_format"
                 partition_format=$old_partition_fmt
             fi
@@ -1350 +1375 @@
 
         if [ ! "$partition_mountpt" ] ; then
-            LogFile "------- $FDISK -l $qq log ------------" 
+            LogFile "------- $FDISK -l $qq log ------------"
             for qq in "" `find /dev/ida/c*d* ! -name '*p*' 2> /dev/null`; do
                 partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
                 [ "$partition_format" ] && break
             done
-            LogFile "------- $FDISK log end ------------" 
+            LogFile "------- $FDISK log end ------------"
             if [ "$partition_format" = "Compaq diagnostics" ] ; then
                 partition_format="compaq"
             elif [ ! "`grep -F device /etc/raidtab 2> /dev/null | grep -w $current_partition`" ] ; then
-                LogAll "Unable to find mountpoint of $current_partition - ignoring"
+                LogAll "WARNING: Unable to find mountpoint of $current_partition - ignoring"
                 continue
             fi
@@ -1372 +1397 @@
         unofficial_outstring=`printf "%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label"`
         if [ "$current_partition" = "" ] ; then
-            LogFile "Unknown partition (outstring = $unofficial_outstring)" 
+            LogFile "WARNING: Unknown partition (outstring = $unofficial_outstring)"
         elif [ "$partition_mountpt" = "" ] && [ -f "/etc/raidtab" ] ; then
             if [ "`grep -F device /etc/raidtab 2>/dev/null | grep -F $current_partition`" ] ; then
@@ -1380 +1405 @@
                 printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$label" >> $mountlist
             else
-                LogFile "Unknown mountpoint (outstring = $unofficial_outstring)" 
+                LogFile "WARNING: Unknown mountpoint (outstring = $unofficial_outstring)"
             fi
         elif [ "$partition_format" = "" ] ; then
-            LogFile "Unknown format (outstring = $unofficial_outstring)" 
+            LogFile "WARNING: Unknown format (outstring = $unofficial_outstring)"
         elif [ "$partition_size" = "" ] ; then
-            LogFile "Unknown partition size (outstring = $unofficial_outstring)" 
+            LogFile "WARNING: Unknown partition size (outstring = $unofficial_outstring)"
         elif [ "$partition_mountpt" = "/proc" ] || [ "$partition_mountpt" = "/dev/pts" ] ; then
             continue
         else
             if [ "$partition_format" = "dos" ] || [ "$partition_format" = "msdos" ] ; then
-                LogFile "vfat should be used instead of dos/msdos as a partition format"
+                LogFile "WARNING: vfat should be used instead of dos/msdos as a partition format"
                 partition_format="vfat"
             fi
@@ -1404 +1429 @@
     # Coherency verification
     ML01=`cat $file | wc -l`
-    ML02=`grep -v ' lvm ' $file | wc -l`
+    ML02=`grep -vE ' lvm | raid | swap ' $file | wc -l`
     ML1=`$AWK '{print $1}' $file | sort -u | wc -l`
-    ML2=`grep -v ' lvm ' $file | $AWK '{print $2}' | sort -u | wc -l`
+    ML2=`grep -vE ' lvm | raid | swap ' $file | $AWK '{print $2}' | sort -u | wc -l`
     if [ "$ML01" -ne "$ML1" ]; then
         LogFile "--------------------------------------------"
-        echo "WARNING: Duplicate device entry in mountlist" | tee -a $LOGFILE
+        LogAll "WARNING: Duplicate device entry in mountlist"
         LogFile "--------------------------------------------"
     fi
     if [ "$ML02" -ne "$ML2" ]; then
         LogFile "--------------------------------------------"
-        echo "WARNING: Duplicate mountpoint entry in mountlist" | tee -a $LOGFILE
+        LogAll "WARNING: Duplicate mountpoint entry in mountlist"
         LogFile "------------------------------------------------"
     fi
@@ -1422 +1447 @@
     local i old_pwd
     if [ -z "$ISO_CMD" ]; then
-        LogFile "Neither mkisofs nor genisoimage found, unable to make CD image"
+        LogAll "ERROR: Neither mkisofs nor genisoimage found, unable to make CD image"
         return
     fi
@@ -1432 +1457 @@
     rm -Rf $MINDI_TMP/iso
     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_DATA" 
+    LogFile "INFO: mindi_lib = $MINDI_DATA" 
+    cp -f $MINDI_CACHE/{*.gz,*.img} $MINDI_TMP/iso/images 2>> $LOGFILE || LogAll "WARNING: OfferToMakeBootableISO: Cannot copy $MINDI_CACHE/*.gz to $MINDI_TMP/iso/images"
     for i in memdisk memtest.bin memtest.img ; do
         j=$MINDI_DATA/$i
         k=$MINDI_TMP/iso
         if [ -e "$j" ] ; then
-            LogAll "Copying $j to $k"
+            LogAll "INFO: Copying $j to $k"
             cp -f $j $k 2>> $LOGFILE || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2>> $LOGFILE || Die "Failed to copy $j to $MINDI_TMP"
@@ -1446 +1471 @@
         fi
     done
-    MakeMessageFile > $MINDI_TMP/iso/message.txt
+    MakeMessageFile | cut -c1-80 > $MINDI_TMP/iso/message.txt
     if [ $KERNEL_IS_XEN = "yes" ]; then
         cp $xenkernelpath $MINDI_TMP/iso/xen.gz 2>> $LOGFILE || Die "Cannot copy xen.gz ($xenkernelpath) to mindi tmp ($MINDI_TMP/iso/xen.gz). Did you run out of disk space?"
@@ -1487 +1512 @@
     fi
     if [ "$?" -ne "0" ] ; then
-        LogFile "----------- $ISO_CMD's errors --------------" 
-        cat $MINDI_TMP/mkisofs.log >> $LOGFILE
-        echo "$ISO_CMD returned the following errors:-"
-        cat $MINDI_TMP/mkisofs.log
-        LogAll "Failed to create ISO image."
+        LogFile "----------- $ISO_CMD's errors --------------"
+        LogAll "$ISO_CMD returned the following errors:"
+        cat $MINDI_TMP/mkisofs.log | tee -a $LOGFILE
+        LogAll "ERROR: Failed to create ISO image."
     else
-        LogAll "Created bootable ISO image at $MINDI_CACHE/mindi.iso" 
+        LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
     fi
     rm -f $MINDI_TMP/mkisofs.log
@@ -1522 +1546 @@
     echo -en "Transforming $USBDEVICE in a Bootable device " 
     echo -en "."
-    LogFile "Transforming $USBDEVICE in a Bootable device"  
-    LogFile "Checking $USBDEVICE" 
+    LogFile "INFO: Transforming $USBDEVICE in a Bootable device"
+    LogFile "INFO: Checking $USBDEVICE"
     $FDISK -l $USBDEVICE 2>&1 >> $LOGFILE
     if [ $? -ne 0 ]; then
-        LogAll "Unable to access $USBDEVICE" 
-        LogAll "Make sure your USB device is pluged in" 
-        exit -1
+        LogAll "ERROR: Unable to access $USBDEVICE"
+        LogAll "       Make sure your USB device is plugged in"
+        MindiExit -1
     fi
     echo -en "."
     # Some distro do auto mount at that point (Ubuntu)
-    LogFile "Unmounting $USBPART just in case"
+    LogFile "INFO: Unmounting $USBPART just in case"
     umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
     # If your key has no MBR it may cause an issue
     # Use dd if=mbr.bin of=$USBDEVICE or ms-sys -s $USBDEVICE
     if [ -r $MBRFILE ]; then
-        LogFile "Installing an MBR ($MBRFILE) on $USBDEVICE"
+        LogAll "INFO: Installing an MBR ($MBRFILE) on $USBDEVICE"
         dd if=$MBRFILE of=$USBDEVICE
     else
-        LogFile "You may need to install an MBR (usually in $MBRFILE, but not found on your system) "
-        LogFile "on $USBDEVICE with dd if=$MBRFILE of=$USBDEVICE"
-    fi
-    LogFile "Preparing $USBDEVICE" 
+        LogAll "WARNING: You may need to install an MBR (usually in $MBRFILE, but not found on your system)"
+        LogAll "         on $USBDEVICE with dd if=$MBRFILE of=$USBDEVICE"
+    fi
+    LogFile "INFO: Preparing $USBDEVICE"
     cat > $MINDI_TMP/fdisk.txt << EOF
 d
@@ -1562 +1586 @@
     $FDISK $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE < $MINDI_TMP/fdisk.txt
     if [ $? -ne 0 ]; then
-        LogAll "Unable to create a vfat Filesystem on $USBDEVICE" 
-        LogAll "Make sure your USB device is pluged in" 
+        LogAll "ERROR: Unable to create a vfat Filesystem on $USBDEVICE"
+        LogAll "       Make sure your USB device is plugged in"
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1
@@ -1572 +1596 @@
     LogFile "----------------"
     rm -f $MINDI_TMP/fdisk.txt
-    LogFile "The USB device $USBDEVICE now looks like this:" 
+    LogFile "INFO: The USB device $USBDEVICE now looks like this:"
     $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
     echo -en "."
+    # Calling kpartx in case devices were not created
+    if [ -x "/sbin/kpartx" ]; then
+        /sbin/kpartx -a $USBDEVICE
+    fi
     # Some distro do auto mount at that point (Ubuntu)
-    LogFile "Unmounting $USBPART just in case again"
+    LogFile "INFO: Unmounting $USBPART just in case again"
     umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
     echo -en "."
-    LogFile "Creating a vfat filesystem on $USBPART" 
+    # Some distro have a dmsetup conf at that point so removing it Cf: http://trac.mondorescue.org/ticket/651
+    if [ "`which dmsetup`" != "" ]; then
+        block_id="`echo $USBPART | sed 's|/dev/||g'`"
+        if [[ "`dmsetup ls | awk '{print $1}' | grep $block_id`" != "" ]]; then
+            LogFile "INFO: Removing $block_id from device mapper."
+            sleep 1
+            dmsetup remove $block_id
+        fi
+    fi
+    echo -en "."
+    LogFile "INFO: Creating a vfat filesystem on $USBPART"
     mkdosfs -F 32 $USBPART 2>&1 >> $LOGFILE
     if [ $? -ne 0 ]; then
-        LogAll "Unable to create a vfat filesystem on $USBPART" 
-        LogAll "Make sure your USB device is pluged in and partitioned ($USBPART must exist on it)" 
+        LogAll "ERROR: Unable to create a vfat filesystem on $USBPART"
+        LogAll "       Make sure your USB device is plugged in and partitioned ($USBPART must exist on it)"
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1
     fi
     echo -en "."
-    LogFile "Mounting $USBPART on $MINDI_TMP/usb" 
+    LogFile "INFO: Mounting $USBPART on $MINDI_TMP/usb"
     mount $USBPART $MINDI_TMP/usb 2>> $LOGFILE
     if [ $? -ne 0 ]; then
-        LogAll "Unable to mount $USBPART on $MINDI_TMP/usb" 
-        LogAll "Make sure your USB device is pluged in, partitioned and formated ($USBPART must exist on it)" 
+        LogAll "ERROR: Unable to mount $USBPART on $MINDI_TMP/usb"
+        LogAll "       Make sure your USB device is plugged in, partitioned and formated ($USBPART must exist on it)"
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1
@@ -1598 +1636 @@
     echo -en "."
     mkdir -p $MINDI_TMP/usb/images
-    cp -f $MINDI_CACHE/*.img $MINDI_CACHE/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogAll "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
+    cp -f $MINDI_CACHE/*.img $MINDI_CACHE/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogAll "ERROR: OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
     echo -en "."
-    LogFile "mindi_lib = $MINDI_DATA" 
+    LogFile "INFO: mindi_lib = $MINDI_DATA"
     for i in memdisk memtest.bin memtest.img ; do
         j=$MINDI_DATA/$i
         k=$MINDI_TMP/usb
         if [ -e "$j" ] ; then
-            LogAll "Copying $j to $k"
+            LogIt "INFO: Copying $j to $k"
             cp -f $j $k 2>> $LOGFILE || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2>> $LOGFILE || Die "Failed to copy $j to $MINDI_TMP"
@@ -1611 +1649 @@
     done
     echo -en "."
-    MakeMessageFile > $MINDI_TMP/usb/message.txt
+    MakeMessageFile | cut -c1-80 > $MINDI_TMP/usb/message.txt
     echo -en "."
     cp $kernelpath $MINDI_TMP/usb/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/usb/vmlinuz). Did you run out of disk space?"
@@ -1630 +1668 @@
     umount $MINDI_TMP/usb
     if [ "$ARCH" != "ia64" ] ; then
-        syslinux -s $USBPART 2>> $MINDI_TMP/syslinux.log
-        if [ "$?" -ne "0" ] ; then
+        syslinux -v 2>&1 | grep -q 4.02
+        if [ $? -eq 0 ]; then
+            # This buggy version of syslinux requires a call to --stupid and not -s
+            syslinux --stupid $USBPART 2>> $MINDI_TMP/syslinux.log
+            res=$?
+        else
+            syslinux -s $USBPART 2>> $MINDI_TMP/syslinux.log
+            res=$?
+        fi
+        if [ $res -ne 0 ] ; then
             LogAll "----------- syslinux's errors --------------"
             cat $MINDI_TMP/syslinux.log |tee -a $LOGFILE
-            echo "------------------------------------------"
-            LogAll "Failed to create USB image."
+            LogAll "------------------------------------------"
+            LogIt "ERROR: Failed to create USB image."
         else
             echo -e "$DONE"
-            LogFile "Created bootable USB image on $USBDEVICE" 
+            LogFile "INFO: Created bootable USB image on $USBDEVICE"
         fi
         rm -f $MINDI_TMP/syslinux.log
     else
-        echo "No USB boot support for ia64" 
+        LogAll "ERROR: No USB boot support for ia64"
         MindiExit -1
     fi
@@ -1718 +1764 @@
             echo -en "default${sep}iso\n"
         else
-            echo -en "default${sep}interactive\n"
+            echo -en "default${sep}${MINDI_DEFAULT_BOOT_OPTION}\n"
         fi
     else
@@ -1726 +1772 @@
     # Handle timeout
     if [ "$CDRECOVERY" != "yes" ] ; then
-        echo -en "timeout${sep}300\n"
+        echo -en "timeout${sep}${MINDI_BOOT_TIMEOUT}\n"
     else
         echo -en "timeout${sep}10000\n"
@@ -1746 +1792 @@
     for i in $options ; do
         ooo=$i
-        [ "$ooo" = "RESTORE" ] && ooo="nuke"
+        [ "$ooo" = "RESTORE" ] && ooo="RESTORE nuke"
         if [ "$type" = "elilo" ]; then
             outstr="image=/vmlinuz\n\tlabel=$i\n\tinitrd=/initrd.img\n\troot=/dev/ram0 append=\" rw ramdisk_size=$ramdisk_size $ooo $MINDI_ADDITIONAL_BOOT_PARAMS \"\n"
@@ -1802 +1848 @@
     fi
 
-    mount -t vfat -o loop $imagefile $mountpoint || LogAll "Cannot mount (PBDI)"
+    mount -t vfat -o loop $imagefile $mountpoint || LogAll "ERROR: Cannot mount (PBDI)"
 
     # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
@@ -1808 +1854 @@
     liloconf=$mountpoint/elilo.conf
 
-    MakeMessageFile > $mountpoint/message.txt
+    MakeMessageFile | cut -c1-80 > $mountpoint/message.txt
 
     if [ "$ARCH" != "ia64" ] ; then
@@ -1833 +1879 @@
     fi
 
-    LogFile "Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..." 
+    LogFile "INFO: Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..." 
     cp -f $MINDI_TMP/initrd.img $mountpoint/initrd.img 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-        LogAll "Failed to copy $MINDI_TMP/initrd.img to $mountpoint"
+        LogAll "ERROR: Failed to copy $MINDI_TMP/initrd.img to $mountpoint"
         cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
-        LogAll "Please unload some of your modules and try again."
+        LogAll "       Please unload some of your modules and try again."
         rm -f $MINDI_TMP/mtpt.$$
-        LogAll "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?). Try to increase EXTRA_SPACE and BOOT_SIZE in $MINDI_CONFIG"
+        LogAll "       Cannot incorporate initrd.img in bootdisk (kernel / modules too big?)."
+        LogAll "       Try to increase EXTRA_SPACE and BOOT_SIZE in $MINDI_CONFIG"
         retval=$(($retval+1))
     fi
@@ -1858 +1905 @@
  
     if [ "$retval" -ne "0" ] ; then
-        LogFile "Files at mountpoint ($mountpoint) :-" 
+        LogFile "INFO: Files at mountpoint ($mountpoint) :"
         du -sk $mountpoint/* >> $LOGFILE
-        LogFile "--- end of list of files ---" 
+        LogFile "--- end of list of files ---"
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n" >> $LOGFILE
         [ "$mountpoint" != "" ] && rm -f $mountpoint/vmlinuz
         cd "$old_pwd"
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-        rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
+        rmdir $mountpoint || LogAll "ERROR: Cannot rmdir (PBDI)"
 
         rm -f $imagefile
@@ -1871 +1918 @@
     fi
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
-    LogFile "Free space left on image = $free_space KB" 
-    LogFile "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" 
+    LogFile "INFO: Free space left on image = $free_space KB"
+    LogFile "INFO: Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K"
 
     # make it bootable
@@ -1883 +1930 @@
     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
     echo -en "..."
-    rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
+    rmdir $mountpoint || LogAll "ERROR: Cannot rmdir (PBDI)"
 
     if [ "$retval" -eq "0" ] ; then
         echo -en "...$DONE\n"
-        LogAll "$BOOT_SIZE KB boot disk was created OK\n"
+        if [ "$KERN_DISK_MADE" ] ; then
+            [ "$imagefile" != "" ] && rm -f $imagefile
+            LogAll "INFO: $BOOT_SIZE KB boot disks were created OK\n"
+        fi
     else
         echo -en "...failed\n"
-        LogAll "$BOOT_SIZE KB boot disk was NOT created\n"
-        rm -f $imagefile
-    fi
-    [ "$retval" -ne "0" ] && LogAll "PrepareBootDiskImage() is returning nonzero"
+        LogAll "WARNING: $BOOT_SIZE""KB boot disk was NOT created\n"
+        [ "$imagefile" != "" ] && rm -f $imagefile
+    fi
+    [ "$retval" -ne "0" ] && LogAll "ERROR: PrepareBootDiskImage() is returning nonzero"
     return $retval
 }
@@ -1944 +1994 @@
         Die "You have $res files present in dependency list\nbut absent from filesystem."
     fi
-    FindAndAddUserKeyboardMappingFile 
+    FindAndAddUserKeyboardMappingFile
     mkdir -p $bigdir/tmp
     [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
@@ -1962 +2012 @@
     i=`cat $MINDI_TMP/BOOTLOADER.DEVICE 2> /dev/null`
     if [ "$i" ] ; then
-        LogAll "Backing up $i's MBR"
+        LogAll "INFO: Backing up $i's MBR"
         dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
         sleep 1
@@ -1968 +2018 @@
         j=$i
         [ -h "$j" ] && j=`readlink -f $j`
-        LogAll "Creating /dev/boot_device ($j)"
+        LogAll "INFO: Creating /dev/boot_device ($j)"
         mkdir -p $bigdir/dev
         cp -pRdf $j $bigdir/dev/boot_device 2>> $LOGFILE || Die "Unable to create /dev/boot_device on ramdisk"
@@ -1980 +2030 @@
     if [ -d /$ti ]; then
         mkdir -p $ti
-        cp -Rdf /$ti/* $ti 2>> $LOGFILE || LogAll "WARNING - error occurred while copying terminfo"
+        cp -Rdf /$ti/* $ti 2>> $LOGFILE || LogAll "ERROR: issue copying terminfo"
     fi
     if [ -e "$MONDO_SHARE/restore-scripts" ]; then
@@ -1987 +2037 @@
     fi
     if [ -d "/lib/dev-state" ]; then 
-        tar cf - -C / ./lib/dev-state 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
+        tar cf - -C / ./lib/dev-state 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "ERROR: Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
     fi
     cd "$old_pwd"
@@ -2006 +2056 @@
         fi
     fi
+    LogFile "Your mountlist.txt file content is:"
+    LogFile "-----------------------------------"
+    cat $bigdir/$MINDI_CACHE/mountlist.txt >> $LOGFILE
+    LogFile "-----------------------------------"
 
     echo -en "Tarring and zipping the data content..."
     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)
+    (cd "$bigdir" ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $imagesdir/all.tar.gz || LogAll "ERROR: Problem creating all.tar.gz" $MINDI_TMP/$$.log)
     LogFile "Size of the data content"
     LogFile "------------------------"
@@ -2124 +2178 @@
     if [ "$?" -eq "0" ] ; then
         cp -f $tmpfile $1 2>> $LOGFILE
-        LogFile "Stripped binary $2" 
+        LogFile "INFO: Stripped binary $2"
     fi
     rm -f $tmpfile
@@ -2164 +2218 @@
         # It's a Xen kernel
         KERNEL_IS_XEN="yes"
-        LogFile "It's a Xen kernel..."
-    fi
-
-    for fname in `find $root -maxdepth 2 -type f | grep -Ei 'lin|kern|xen' | grep -Ev '^/proc/|^/net/'` ; do
+        LogFile "INFO: It's a Xen kernel..."
+    fi
+
+    for fname in `find $root -maxdepth 2 -type f | grep -Ei 'lin|kern|xen' | grep -Ev '^/proc/|^/net/|^/mnt|^/lib|^/lib64|^/bin|^/sbin|^/usr|^/tmp'` ; do
         [ ! -e "$fname" ] && continue
         [ "$fname" = "/boot/vmlinuz.shipped" ] && [ -f "/boot/vmlinuz" ] && continue; # ignore SuSE's extra kernel
@@ -2200 +2254 @@
     fi
     if [ ! "$possible_kernels" ] ; then
-        LogAll "No kernel matches exactly. Are there any duff kernels?"
+        LogAll "INFO: No kernel matches exactly. Are there any duff kernels?"
         possible_kernels="$duff_kernels"
         if [ ! "$possible_kernels" ] ; then
-            LogAll "Sorry, no duff kernels either"
+            LogAll "INFO: Sorry, no duff kernels either"
         else
-            LogAll "I bet you're running Debian or Gentoo, aren't you?"
-            LogAll "Your kernel doesn't have a sane builddate. Oh well..."
+            LogAll "INFO: I bet you're running Debian or Gentoo, aren't you?"
+            LogAll "INFO: Your kernel doesn't have a sane builddate. Oh well..."
         fi
     fi
@@ -2219 +2273 @@
         LogAll "Could not find your kernel."
         if [ -e "/boot/vmlinuz" ] ; then
-            LogAll "Using /boot/vmlinuz as a last resort."
+            LogAll "INFO: Using /boot/vmlinuz as a last resort."
             output=/boot/vmlinuz
         else
@@ -2226 +2280 @@
     elif [ "$noof_kernels" -eq "1" ] ; then
         kp=`echo "$possible_kernels" | sed s/' '//`
-        LogFile "Your kernel is $kp (v$KERVERRUN)"
+        LogFile "INFO: Your kernel is $kp (v$KERVERRUN)"
         output="$kp"
     else
         for i in $possible_kernels ; do
             if [ "`echo $i | grep "$KERVERRUN"`" ]; then
-                LogAll "OK, I used my initiative and found that "
-                LogAll "$i is probably your kernel. "
+                LogAll "INFO: OK, I used my initiative and found that "
+                LogAll "INFO: $i is probably your kernel. "
                 output="$i"
                 break
@@ -2240 +2294 @@
             if [ "`echo " $possible_kernels " | grep -F "/boot/vmlinuz " &> /dev/null`" ]; then
                 output=/boot/vmlinuz
-                LogFile "Schlomo, this one's for you."
+                LogFile "INFO: Schlomo, this one's for you."
             else
-                LogFile "Two or more possible kernels found. You may specify any one of them and the "
-                LogFile "boot disks will still work, probably. If one does not work, try another."
-                LogFile "$possible_kernels"
+                LogFile "INFO: Two or more possible kernels found. You may specify any one of them and the "
+                LogFile "INFO: boot disks will still work, probably. If one does not work, try another."
+                LogFile "INFO: $possible_kernels"
                 output=""
             fi
@@ -2254 +2308 @@
         elif [ "$noof_xenkernels" -eq "1" ]; then
             xenkernelpath=`echo "$possible_xenkernels" | sed s/' '//`
-            LogFile "Your Xen kernel is $xenkernelpath (v$KERVERRUN)"
+            LogFile "INFO: Your Xen kernel is $xenkernelpath (v$KERVERRUN)"
         else
             for i in $possible_xenkernels ; do
                 if [ "`echo $i | grep "$KERVERRUN"`" ]; then
-                    LogFile "OK, I used my initiative and found that "
-                    LogFile "$i is probably your Xen kernel. "
+                    LogFile "INFO: OK, I used my initiative and found that "
+                    LogFile "INFO: $i is probably your Xen kernel. "
                     xenkernelpath="$i"
                     break
@@ -2268 +2322 @@
                 if [ ! -n "$new_possible_xenkernels" ]; then
                     xenkernelpath=`echo $new_possible_xenkernels | tr -s ' ' '\n' | head -1`
-                    LogFile "Using $xenkernelpath"
+                    LogFile "INFO: Using $xenkernelpath"
                 else
-                    LogFile "Two or more possible Xen kernels found. You may specify any one of them and the "
-                    LogFile "boot disks will still work, probably. If one does not work, try another."
-                    LogFile "$possible_xenkernels"
+                    LogFile "INFO: Two or more possible Xen kernels found. You may specify any one of them and the "
+                    LogFile "INFO: boot disks will still work, probably. If one does not work, try another."
+                    LogFile "INFO: $possible_xenkernels"
                     output=""
                     xenkernelpath=`echo $possible_xenkernels | tr -s ' ' '\n' | head -1`
-                    LogFile "Using $xenkernelpath"
+                    LogFile "INFO: Using $xenkernelpath"
                 fi
             fi
@@ -2302 +2356 @@
     # Get kbd conf from data disk preparation
     cat $MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis
-    # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs
+    # AL04Oct08: Check whether /lib64 or /lib 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
+    if [ -h "/lib" ]; then
+        echo usr/lib  >> $MINDI_TMP/mkdir.lis
+        mv lib/* usr/lib
+        echo ln -s usr/lib lib  >> $MINDI_TMP/ln.lis
+    fi
+    # Check whether /sbin and /bin are a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
+    if [ -h "/sbin" ]; then
+        echo usr/sbin  >> $MINDI_TMP/mkdir.lis
+        mv sbin/* usr/sbin
+        echo ln -s usr/sbin sbin >> $MINDI_TMP/ln.lis
+    fi
+    if [ -h "/bin" ]; then
+        echo usr/bin  >> $MINDI_TMP/mkdir.lis
+        mv bin/* usr/bin
+        echo ln -s usr/bin bin >> $MINDI_TMP/ln.lis
     fi
 
@@ -2330 +2400 @@
     echo /etc/ld.so.c* >> $MINDI_TMP/cp.lis
 
-    # Avoid an issue on some distro (RHEL5)
+    # Handle the case where busybox and mount are dynamically linked
+    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
+    if [ $? -eq 0 ]; then
+        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
+        rm -f bin/mount
+    fi
+
+    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
+    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
+    for f in `grep -v " *#.*" $DEPLIST_DIR/minimal.conf | sort -u`; do
+        if [ -r $f ]; then
+            echo $f >> $MINDI_TMP/minimal.lis
+            LocateDeps $f >> $MINDI_TMP/minimal2.lis
+        fi
+    done
+    for f in `cat $MINDI_TMP/minimal.lis` `sort -u $MINDI_TMP/minimal2.lis`; do
+        ReadAllLink $f >> $MINDI_TMP/minimal.lis
+    done
+    # Initial / are trucated by tar
+    finallist=""
+    # Remove directories from the list, as tar will create them anyway
+    # and it may hurt if /lib is in it as on Debian/Ubuntu
+    for f in `sort -u $MINDI_TMP/minimal.lis`; do
+        if [ ! -d $f ]; then
+            finallist="$finallist $f"
+        fi
+    done
+    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
+
+    # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
+    ln -sf /bin/bash bin/sh
+    LogIt "INFO: Using bash as default shell"
+    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
+
+    # Avoids an issue on some distro (RHEL5)
     echo ./etc/ld.so.conf.d/kernelcap* >> $MINDI_TMP/rm.lis
 
@@ -2341 +2445 @@
     if [ $? -eq 0 ]; then
         USE_UDEV="yes"
-        LogFile "udev device manager found"
+        LogFile "INFO: 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
@@ -2373 +2477 @@
             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"
+            LogAll "WARNING: udevd daemon not in standard place (/sbin or /usr/bin)"
+            LogAll "         mindi will use static devices which may cause problems"
         fi
     fi
@@ -2382 +2486 @@
     mindi-bkphw $MINDI_CACHE $MINDI_CONF | tee -a $LOGFILE
     if [ -d $MINDI_CACHE/bkphw ]; then
-        LogAll "Hardware Information found and saved ..."
+        LogAll "INFO: Hardware Information found and saved ..."
         echo $MINDI_CACHE/bkphw >> $MIDNDI_TMP/cp.lis
         if [ -f $MINDI_CACHE/tools.files ]; then
@@ -2421 +2525 @@
     fi
     for i in $DENY_MODS; do
-        LogFile "Removing $i from the list of modules to load" 
+        LogFile "INFO: 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."
+    [ -e "$needed_modules_path" ] || LogAll "WARNING: 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`"
@@ -2457 +2561 @@
     # Copy an additional ProLiant tool for OBDR support
     if [ -f $MINDI_TMP/OBDR ]; then
+        found=0
         if [ -x /usr/bin/hpsa_obdr_mode ]; then
             echo $mountpoint/usr/bin >> $MINDI_TMP/mkdir.lis
             echo /usr/bin/hpsa_obdr_mode >> $MINDI_TMP/cp.lis
-            LogIt "Copying /usr/bin/hpsa_obdr_mode to ramdisk for improved OBDR support"
-        else
-            LogAll "WARNING: You're using OBDR mode without having the /usr/bin/hpsa_obdr_mode tool"
+            LogIt "INFO: Copying /usr/bin/hpsa_obdr_mode to ramdisk for improved Smart Array OBDR support"
+            found=1
+        fi
+        if [ -x /usr/bin/sg_wr_mode ]; then
+            mkdir -p $mountpoint/usr/bin
+            lis="/usr/bin/sg_map /usr/bin/sg_inq /usr/bin/sg_reset /usr/bin/rev"
+            LocateDeps $lis > $MINDI_TMP/obdr.lis
+            (cd $mountpoint ; tar cf - $lis -C /  `sort -u $MINDI_TMP/obdr.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in obdr.lis analysis" $MINDI_TMP/$$.log)
+            LogIt "INFO: Copying /usr/bin/sg_reset to ramdisk for improved SCSI OBDR support"
+            found=1
+        fi
+        if [ $found -eq 0 ]; then
+            LogAll "WARNING: You're using OBDR mode without having the /usr/bin/hpsa_obdr_mode nor the /usr/bin/sg_wr_mode tool"
             LogAll "         This may lead to a tape not going back to sequential mode after OBDR boot"
         fi
@@ -2523 +2638 @@
     LogFile "Content of initial ramdisk:"
     LogFile "---------------------------"
+    mkdir -p $mountpoint/proc
     (cd "$mountpoint" ; ls -Rla ) >> $LOGFILE
     LogFile "---------------------------"
 
     # Determine what filesystem to use for initrd image
-    LogFile "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd." 
+    LogFile "INFO: Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd."
     gvFileSystem=`GetInitrdFilesystemToUse ${kernelpath}`
     [ -z  gvFileSystem ] && Die "GetFilesystemToUse() failed. Terminating."
-    if [ "$gvFileSystem" = "ext2fs" ] || [ "$gvFileSystem" = "ext3fs" ]; then
+    if [ "$gvFileSystem" = "ext2fs" ] || [ "$gvFileSystem" = "ext3fs" ] || [ "$gvFileSystem" = "ext4fs" ]; then
         # say what will be used
-        LogFile "Creating an $gvFileSystem initrd image..."
+        LogFile "INFO: Creating an $gvFileSystem initrd image..."
         # kernel expects linuxrc in ext2 filesystem
         ( cd "$mountpoint" && ln -sf sbin/init linuxrc )
@@ -2538 +2654 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null
-        bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
+        if [ "$gvFileSystem" = "ext4fs" ] && [ -x "/sbin/tune4fs" ]; then
+            bs=`/sbin/tune4fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
+        else
+            bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
+        fi
         MINDI_ADDITIONAL_BOOT_PARAMS="$MINDI_ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs"
         gzip -c9 ${rdz_fname}.tmp > $rdz_fname
         rm -f ${rdz_fname}.tmp
         # log that we are done
-        LogFile "...done." 
+        LogFile "      ...done."
     elif [ "$gvFileSystem" = "initramfs" ]; then
         # say what will be used
-        LogFile "Creating a gzip'ed cpio (AKA initramfs) initrd image..." 
+        LogFile "INFO: Creating a gzip'ed cpio (AKA initramfs) initrd image..."
         # make sure that cpio is there
         which cpio &> /dev/null; [ $? -eq 0 ] || Die "cpio not found. Please install package cpio and try again."
@@ -2558 +2678 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         # log that we are done
-        LogFile "...done." 
+        LogFile "      ...done."
     else
         Die "Filesystem $gvFileSystem not supported for initrd image. Terminating."
@@ -2585 +2705 @@
 fi
 
+# --nolog needs to be first, and is used in analyze-my-lvm
+if [ "$1" = "--nolog" ] ; then
+    shift
+    LOGFILE=/dev/stderr
+else
+    > $LOGFILE
+fi
 if [ "$1" = "--printvar" ] ; then
     shift
@@ -2594 +2721 @@
 
 > $LOGFILE
-LogFile "mindi v$MINDI_VERSION" 
-LogFile "$ARCH architecture detected" 
-LogFile "mindi called with the following arguments:" 
-LogFile "$*"
-LogFile "Start date : `date`" 
-LogFile "-----------------------------" 
+LogFile "mindi v$MINDI_VERSION"
+LogFile "$ARCH architecture detected"
+LogFile "mindi called with the following arguments:"
+echo "$@">> $LOGFILE
+LogFile "Start date : `date`"
+LogFile "-----------------------------"
 
 # Log some capital variables
@@ -2609 +2736 @@
 LogFile "MINDI_CONF = $MINDI_CONF" 
 if [ -f $MINDI_CONFIG ]; then
-    LogFile "-----------------------------" 
-    LogFile " Mindi configuration file    " 
-    LogFile "-----------------------------" 
+    LogFile "-----------------------------"
+    LogFile " Mindi configuration file    "
+    LogFile "-----------------------------"
     grep -Ev '^#' $MINDI_CONFIG >> $LOGFILE
-    LogFile "-----------------------------" 
-fi
-
+    LogFile "-----------------------------"
+fi
+LogFile "In Mindi"
+LogFile "--------"
+LogFile "EXTRA_SPACE = $EXTRA_SPACE"
+LogFile "BOOT_SIZE = $BOOT_SIZE"
+LogFile "--------"
 
 trap AbortHere SIGTERM SIGHUP SIGQUIT SIGKILL SIGABRT SIGINT
@@ -2626 +2757 @@
 if which awk &> /dev/null ; then
     if ! which gawk &> /dev/null ; then
-        LogAll "You have awk but not gawk.\nPlease note that mindi works fine with a _sane_ awk binary.\nIf your awk binary misbehaves then please contact your vendor\nor distribution's mailing list for technical support.\n"
+        LogIt "INFO: You have awk but not gawk.\nPlease note that mindi works fine with a _sane_ awk binary.\nIf your awk binary misbehaves then please contact your vendor\nor distribution's mailing list for technical support.\n"
     fi
 fi
@@ -2632 +2763 @@
 [ ! -e "$FDISK" ] && Die "Cannot find $FDISK"
 
-[ "`echo $KERVERRUN | grep "2.4.[0-6]" | grep -v "2.4.[0-9][0-9]"`" != "" ] &&  echo "WARNING! Your kernel may have buggy loopfs code. Consider upgrading to 2.4.7"
+[ "`echo $KERVERRUN | grep -E "2\.4\.[0-6]" | grep -vE "2\.4\.[0-9][0-9]"`" != "" ] &&  echo "WARNING! Your kernel may have buggy loopfs code. Consider upgrading to 2.4.7"
 
 # Update the PATH variable if incomplete
@@ -2638 +2769 @@
     PATH=$PATH:/sbin:/usr/sbin
     export PATH
-    LogFile "Your PATH did not include /sbin or /usr/sbin. I have fixed that, temporarily." 
-    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." 
+    LogFile "INFO: Your PATH did not include /sbin or /usr/sbin. I have fixed that, temporarily."
+    LogFile "INFO: However, you may wish to ask your vendor to provide a permanent fix..."
+    LogFile "INFO:  Or you might like to call 'su -' instead of 'su', for example."
 fi
 
@@ -2682 +2813 @@
 fi
 
-LogFile "LVM set to $LVM" 
-LogFile "----------" 
-LogFile "mount result:" 
-LogFile "-------------" 
+LogFile "INFO: LVM set to $LVM"
+LogFile "----------"
+LogFile "mount result:"
+LogFile "-------------"
 mount >> $LOGFILE
-LogFile "-------------" 
 if [ -e /etc/raidtab ]; then
-    LogFile "-------------" 
-    LogFile "/etc/raidtab content:" 
-    LogFile "-------------" 
+    LogFile "-------------"
+    LogFile "/etc/raidtab content:"
+    LogFile "-------------"
     cat /etc/raidtab >> $LOGFILE
+else
+    LogFile "No file /etc/raidtab"
+fi
+if [ -e /etc/mdadm.conf ]; then
+    LogFile "-------------"
+    LogFile "/etc/mdadm.conf content:"
+    LogFile "-------------"
+    cat /etc/mdadm.conf >> $LOGFILE
+else
+    LogFile "-------------"
+    LogFile "No file /etc/mdadm.conf"
 fi
 LogFile "-------------" 
@@ -2702 +2843 @@
 LogFile "-------------" 
 cat /proc/swaps >> $LOGFILE
-LogFile "-------------" 
-LogFile "cat /proc/partitions:" 
-LogFile "-------------" 
+LogFile "-------------"
+if [ -e /proc/mdstat ]; then
+    LogFile "cat /proc/mdstat:"
+    LogFile "-------------"
+    cat /proc/mdstat >> $LOGFILE
+else
+    LogFile "No pseudo file /proc/mdstat"
+fi
+LogFile "-------------"
+LogFile "cat /proc/partitions:"
+LogFile "-------------"
 cat /proc/partitions >> $LOGFILE
-LogFile "-------------" 
-LogFile "cat /proc/filesystems:" 
-LogFile "-------------" 
+LogFile "-------------"
+LogFile "cat /proc/filesystems:"
+LogFile "-------------"
 cat /proc/filesystems >> $LOGFILE
-LogFile "-------------" 
-LogFile "lsmod result:" 
-LogFile "-------------" 
+LogFile "-------------"
+LogFile "lsmod result:"
+LogFile "-------------"
 lsmod >> $LOGFILE
 MODULES="`cat /proc/modules | $AWK '{print $1}'`"
 if [ -x /usr/sbin/esxcfg-module ]; then
-    LogFile "-------------" 
-    LogFile "VMWare ESX server detected - Enabling dedicated support" 
-    LogFile "-------------" 
-    LogFile "VMWare modules" 
-    LogFile "-------------" 
+    LogFile "-------------"
+    LogFile "INFO: VMWare ESX server detected - Enabling dedicated support"
+    LogFile "-------------"
+    LogFile "VMWare modules"
+    LogFile "-------------"
     /usr/sbin/esxcfg-module -l >> $LOGFILE
     MODULES="$MODULES `/usr/sbin/esxcfg-module -l | $AWK '{print $1}'`"
 fi
-LogFile "FORCE_MODS:" 
-LogFile "-------------" 
-LogFile $FORCE_MODS 
-LogFile "-------------" 
-LogFile "DENY_MODS:" 
-LogFile "-------------" 
-LogFile $DENY_MODS 
-LogFile "-------------" 
-LogFile "df result:" 
-LogFile "----------" 
-df -T >> $LOGFILE
-LogFile "-------------" 
 LogFile "Liste of extra modules is:" 
 LogFile "-------------" 
 LogFile "$EXTRA_MODS" 
 LogFile "-------------" 
+LogFile "FORCE_MODS:"
+LogFile "-------------"
+LogFile "$FORCE_MODS"
+LogFile "-------------"
+LogFile "DENY_MODS:"
+LogFile "-------------"
+LogFile "$DENY_MODS"
+LogFile "-------------"
+LogFile "df result:"
+LogFile "----------"
+df -aT >> $LOGFILE
+LogFile "-------------"
+LogFile "df -i result:"
+LogFile "----------"
+df -i >> $LOGFILE
+LogFile "-------------"
+if [ -r /boot/grub/menu.lst ]; then
+    LogFile "-------------"
+    LogFile "INFO: /boot/grub/menu.lst content"
+    LogFile "-------------"
+    cat /boot/grub/menu.lst >> $LOGFILE
+    LogFile "-------------"
+fi
+if [ -r /boot/grub/grub.conf ]; then
+    LogFile "-------------"
+    LogFile "INFO: /boot/grub/grub.conf content"
+    LogFile "-------------"
+    cat /boot/grub/grub.conf >> $LOGFILE
+    LogFile "-------------"
+fi
+if [ -r /boot/grub/grub.cfg ]; then
+    LogFile "-------------"
+    LogFile "INFO: /boot/grub/grub.cfg content"
+    LogFile "-------------"
+    cat /boot/grub/grub.cfg >> $LOGFILE
+    LogFile "-------------"
+fi
+if [ -r /boot/grub/device.map ]; then
+    LogFile "-------------"
+    LogFile "INFO: /boot/grub/device.map content"
+    LogFile "-------------"
+    cat /boot/grub/device.map >> $LOGFILE
+    LogFile "-------------"
+fi
+if [ -r /etc/lilo.conf ]; then
+    LogFile "-------------"
+    LogFile "INFO: /etc/lilo.conf content"
+    LogFile "-------------"
+    cat /etc/lilo.conf >> $LOGFILE
+fi
+LogFile "Full fdisk info"
+LogFile "---------------"
+$FDISK -l >> $LOGFILE
+LogFile "----------------"
+LogFile "List of extra modules is:"
+LogFile "$EXTRA_MODS"
+LogFile "-------------"
 
 # Compute libata version
@@ -2747 +2941 @@
     if [ "$laver" = "2" ]; then
         DENY_MODS="$DENY_MODS ide-generic"
-        LogFile "ide-generic removed from module list as your system uses libata v2+" 
-        LogFile "-------------" 
-    fi
+        LogFile "INFO: ide-generic removed from module list as your system uses libata v2+"
+        LogFile "-------------"
+    fi
+fi
+
+# Check for McAfee which disturbs the access to some files (tgz in articular)
+if [ "x`cat /proc/linuxshield/enabled 2>/dev/null`" = "x1" ]; then
+    LogFile "WARNING: McAfee LinuxShield is enabled. McAfee might block access to certain special files."
+    LogFile "WARNING: Check in /var/opt/NAI/LinuxShield/etc/nailsd.cfg for 'nailsd.profile.OAS.action.error: Block'"
+    LogFile "WARNING: You have two options:"
+    LogFile "WARNING:  - Exclude all directories with special files (check McAfee System Events Log)"
+    LogFile "WARNING:  - Disable the scanner during the backup"
 fi
 
 # Check for ISO_CMD command
 if [ ! -x $ISO_CMD ]; then
-    echo "NOTE: No CD image (ISO file) utility found" >> $LOGFILE
+    LogFile "NOTE: No CD image (ISO file) utility found"
 fi
 
@@ -2788 +2991 @@
             if [ $KERNEL_IS_XEN = "yes" ]; then
                 echo "$xenkernelpath"
-                LogOnly "xenkernelpath = $xenkernelpath"
+                LogFile "INFO: xenkernelpath = $xenkernelpath"
                 MindiExit 0
             else
@@ -2795 +2998 @@
         else
             echo "$resk"
-            LogOnly "kernelpath = $resk"
+            LogFile "INFO: kernelpath = $resk"
             MindiExit 0
         fi
@@ -2806 +3009 @@
     elif [ "$1" = "--readalllink" ] ; then
         [ ! "$2" ] && Die "Please specify the binary to look at"
-        shift
-        ReadAllLink $*
         # Avoids logfile content for mondo
         export MONDO_SHARE=""
+        ReadAllLink $2
         MindiExit $?
     elif [ "$1" = "--makemessage" ] ; then
-        MakeMessageFile
+        MakeMessageFile | cut -c1-80
         MindiExit 0
     elif [ "$1" = "--makemountlist" ] ; then
@@ -2853 +3055 @@
 ###
         if [ $KERNEL_IS_XEN = "yes" ]; then
-            LogAll "xenkernelpath = $xenkernelpath"
+            LogAll "INFO: xenkernelpath = $xenkernelpath"
         fi
         kernelname=`echo $kernelpath | cut -d'-' -f2- | sed 's/.[bg]z[2]*$//'`
         if [ ! -d "/lib/modules/$kernelname" ]
         then
-           LogAll "Module path for ${kernelpath} not found..."
-           LogAll "using running kernel\'s modules."
+           LogAll "WARNING: Module path for ${kernelpath} not found..."
+           LogAll "         using running kernel\'s modules."
            kernelname=$KERVERRUN
         else
            LogAll "Using modules for kernel: ${kernelname}"
         fi
-        LogAll "kernelname = $kernelname"
-        LogAll "kernelpath = $kernelpath"
+        LogAll "INFO: kernelname = $kernelname"
+        LogAll "INFO: kernelpath = $kernelpath"
 ###
 ### end of Sq-Modification
@@ -2881 +3083 @@
         if [ "${11}" ] ; then
             LILO_OPTIONS=""
-    #       LogAll "LILO will use conservative settings, to be compatible with older BIOSes."
+    #       LogAll "INFO: LILO will use conservative settings, to be compatible with older BIOSes."
         fi
         ESTIMATED_TOTAL_NOOF_SLICES=${12}
@@ -2918 +3120 @@
 LogFile "DIFFERENTIAL = $DIFFERENTIAL" 
 LogFile "INTERNAL TAPE BLOCK SIZE = $INTERNAL_TAPE_BLOCK_SIZE" 
+if [ -f $MINDI_LIB/rootfs/bin/busybox ]; then
+    LogIt "Mindi-`$MINDI_LIB/rootfs/bin/busybox 2>&1 | head -1`"
+else
+    LogIt "ERROR: No mindi-busybox installed"
+fi
 
 if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
-    LogAll "Including the generation of a Bootable USB device on $USBDEVICE"
+    LogAll "INFO: Including the generation of a Bootable USB device on $USBDEVICE"
 fi
 
@@ -2940 +3147 @@
     fi
 fi
-LogFile "Mindi's temp dir=$MINDI_TMP"
-LogFile "Mindi's output dir=$MINDI_CACHE" 
-[ "$(($RANDOM%64))" -eq "0" ] && LogAll "Dude, I've looked inside your computer and it's really dusty..."
+LogFile "INFO: Mindi's temp dir=$MINDI_TMP"
+LogFile "MINFO: indi's output dir=$MINDI_CACHE" 
+[ "$(($RANDOM%64))" -eq "0" ] && LogIt "INFO: Dude, I've looked inside your computer and it's really dusty..."
 
 PrepareDataDiskImages
@@ -2948 +3155 @@
 export ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
 
-LogFile "Ramdisk will be $ramdisk_size KB" 
+LogFile "INFO: Ramdisk will be $ramdisk_size KB"
 PrepareBootDiskImage $kernelpath || Die "Failed to create $ramdisk_size MB disk image."
 
@@ -2983 +3190 @@
 fi
 # cleanup
-LogAll "$FRIENDLY_OUTSTRING"
+LogAll "INFO: $FRIENDLY_OUTSTRING"
 for mtpt in $FLOPPY_WAS_MOUNTED ; do
     mount $mtpt

branches/3.1/mindi/mindi-bkphw

@@ -2 +2 @@
 #
 # $Id$
+# Copyright B. Cornec 2005-2013
+# Provided under the GPL v2
 #
 # Backup the hardware configuration on machine supporting it
@@ -8 +10 @@
 use strict;
 use File::Basename;
+
+=pod
+
+=head1 NAME
+
+mindi-bkphw keeps track of your hardware configuration (BIOS, Raid, Management board, ...)
+
+=head1 DESCRIPTION
+
+mindi-bkphw keeps track of your hardware configuration by calling the tool provided by IHV (Independant Hardware Vendor) in order to store the configuration of the system BIOS, the RAID controller or the onboard management card if any of those is present.
+
+For the moment, this is only working for HP ProLiant servers, as HP provides all these tools in a convenient way to perform these actions. Other manufacturer can provide patches or relevant info in order to be supported as well here.
+
+=head1 SYNOPSIS
+
+mindi-bkphw /path/to/cache-dir /path/to/conf-dir
+
+=head1 ARGUMENTS
+
+=over 4
+
+=item B</path/to/cache-dir> 
+
+This is the directory where the generated files will be stored.
+
+=item B</path/to/conf-dir>
+
+This is the directory where the configuration file describing the tools needed to backup hardware information is stored. Generaly /etc/mindi. It should contain a deplist.d subdirectory, and for now only the ProLiant.conf file is used in it.
+
+=back
+
+=head1 WEB SITES
+
+The main Web site of the project is available at L<http://www.mondorescue.org>. Bug reports should be filled using the trac instance of the project at L<http://trac.mondorescue.org/>.
+
+=head1 USER MAILING LIST
+
+For community exchanges around MondoRescue please use the list L<http://sourceforge.net/mailarchive/forum.php?forum_name=mondo-devel>
+
+=head1 AUTHORS
+
+The MondoRescue team lead by Bruno Cornec L<mailto:bruno@mondorescue.org>.
+
+=head1 COPYRIGHT
+
+MondoRescue is distributed under the GPL v2.0 license or later,
+described in the file C<COPYING> included with the distribution.
+
+=cut
+
 
 # Handling Configuration files
@@ -31 +83 @@
 close(SYSTEM);
 
-die "WARNING: No product name found for Hardware support\n" if (not defined $productname);
+die "INFO: No product name found for Hardware support\n" if (not defined $productname);
 
 if ($productname =~ /proliant/i) {
     print "Detected a $productname. Nice. Continue to support my job :-)\n";
     print "Activating ProLiant support for mindi\n";
-    print "You can install the SmartStart Scripting toolkit tool $tool\nto benefit from mindi's enhanced ProLiant support\n";
-    print "Get it from http://www.hp.com/servers/sstoolkit\n";
-    print "And use the SDR to get all other HP ProLiant packages\n";
-    print "Get it from http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/\n";
+    print "You can install SDR packages to benefit from mindi's enhanced ProLiant support\n";
+    print "Get them from http://downloads.linux.hp.com/SDR/\n";
     open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "Unable to open $confdir/deplist.d/ProLiant.conf";
     # generate a list of what need to be put on the backup media
@@ -71 +121 @@
         }
         if ($tool =~ /\/conrep$/) {
+            my $xmlf = "/opt/hp/hp-scripting-tools/etc/conrep.xml";
             # From the package
-            if (! -f "/opt/hp/hp-scripting-tools/etc/conrep.xml") {
-                $ret = system("$tool -s -x /opt/hp/hp-scripting-tools/etc/conrep.xml -f$bkpdir/conrep.dat");
+            if (-f $xmlf) {
+                $ret = system("$tool -s -x $xmlf -f$bkpdir/conrep.dat");
             # From the SSSTK
-            } elsif (! -f "/usr/share/conrep/conrep.xml") {
-                $ret = system("$tool -s -x /usr/share/conrep/conrep.xml -f$bkpdir/conrep.dat");
             } else {
-                next;
+                $xmlf = "/usr/share/conrep/conrep.xml";
+                if (-f $xmlf) {
+                    $ret = system("$tool -s -x $xmlf -f$bkpdir/conrep.dat");
+                } else {
+                    next;
+                }
             }
             print SCRIPT "$tool -l -f$locbkpdir/conrep.dat\n";
-            print TOOLS "$tool.xml\n";
+            print TOOLS "$xmlf\n";
+        }
+        if ($tool =~ /\/hp-rcu$/) {
+            $ret = system("$tool -s -f$bkpdir/conrep.dat");
+            print SCRIPT "$tool -l -f$locbkpdir/conrep.dat\n";
         }
         if ($tool =~ /\/hpacuscripting$/) {
@@ -100 +158 @@
             print SCRIPT "./$tool -s\n";
         }
+        if ($tool =~ /\/hp-fm/) {
+            print "Found $tool, firmware will be upgraded at restore time on your HP ProLiant\n";
+            print SCRIPT "./$tool upgrade\n";
+        }
         # Kept for compatibility with older version of tools
         if (($tool =~ /\/hpacucli$/) && ($hasfound == 0)) {
@@ -114 +176 @@
     close(SCRIPT);
 } else {
-    print "\nWARNING: No Hardware support for $productname.\nNot a big issue, just less features and risks ;-)\n";
+    print "\nINFO: 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 (harmless)\n";
 }

branches/3.1/mindi/mindi-get-perl-modules

@@ -1 +1 @@
 #!/usr/bin/perl -w
+#
+# $Id$
+# Copyright B. Cornec 2005-2013
+# Provided under the GPL v2
 #
 # Get perl modules required by mindi and mondo and that should be on the restore media
@@ -7 +11 @@
 use File::Find;
 use Cwd;
+
+
+=pod
+
+=head1 NAME
+
+mindi-get-perl-modules keeps track of the perl modules that should be on your restore media
+
+=head1 DESCRIPTION
+
+mindi-get-perl-modules keeps track of the perl modules that should be on your restore media by analyzing the references made to them in the scripts passed as parameters and returning all the modules needed to have them work correctly.
+
+=head1 SYNOPSIS
+
+mindi-get-perl-modules /path/to/perl-script ...
+
+=head1 ARGUMENTS
+
+=over 4
+
+=item B</path/to/perl-script> 
+
+This is the path of the perl script to analyze and for which we want its perl modules in dependence to be included
+
+=back
+
+=head1 WEB SITES
+
+The main Web site of the project is available at L<http://www.mondorescue.org>. Bug reports should be filled using the trac instance of the project at L<http://trac.mondorescue.org/>.
+
+=head1 USER MAILING LIST
+
+For community exchanges around MondoRescue please use the list L<http://sourceforge.net/mailarchive/forum.php?forum_name=mondo-devel>
+
+=head1 AUTHORS
+
+The MondoRescue team lead by Bruno Cornec L<mailto:bruno@mondorescue.org>.
+
+=head1 COPYRIGHT
+
+MondoRescue is distributed under the GPL v2.0 license or later,
+described in the file C<COPYING> included with the distribution.
+
+=cut
+
 
 my $file = get_perl_modules(@ARGV) if (defined $ARGV[0]);
@@ -100 +149 @@
 sub process_file {
   
-    my %line;
-    my %require;
-    my $current_line;
-    my $tag;
-
-    foreach my $file (@_) {
+my %line;
+my %require;
+my $current_line;
+my $tag;
+
+foreach my $file (@_) {
   
-  open(FILE, "<$file") || return(\%require);
-  
-  while (<FILE>) {
-    
-    # skip the "= <<" block
-
-    if ( ( m/^\s*\$(.*)\s*=\s*<<\s*["'](.*)['"]/i) ||
-         ( m/^\s*\$(.*)\s*=\s*<<\s*(.*);/i) ) {
-      $tag = $2;
-      while (<FILE>) {
-        ( $_ =~ /^$tag/) && last;
-      }
-    }
-
-    # skip the documentation
-
-    # we should not need to have item in this if statement (it
-    # properly belongs in the over/back section) but people do not
-    # read the perldoc.
-
-    if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {
-      next;
-    }
-
-    if ( (m/^=(over)/) .. (m/^=(back)/) ) {
-      next;
-    }
-    
-    # skip the data section
-    if (m/^__(DATA|END)__$/) {
-      last;
-    }
-
-    # Each keyword can appear multiple times.  Don't
-    #  bother with datastructures to store these strings,
-    #  if we need to print it print it now.
-    
-    if ( m/^\s*\$RPM_Requires\s*=\s*["'](.*)['"]/i) {
-      foreach $_ (split(/\s+/, $1)) {
-    print "$_\n";
-      }
-    }
-
-    if ( 
+    open(FILE, "<$file") || return(\%require);
+    while (<FILE>) {
+
+        # skip the "= <<" block
+
+        if ( ( m/^\s*\$(.*)\s*=\s*<<\s*["'](.*)['"]/i) ||
+            ( m/^\s*\$(.*)\s*=\s*<<\s*(.*);/i) ) {
+            $tag = $2;
+            while (<FILE>) {
+                ( $_ =~ /^$tag/) && last;
+            }
+        }
+
+        # skip the documentation
+    
+        # we should not need to have item in this if statement (it
+        # properly belongs in the over/back section) but people do not
+        # read the perldoc.
+    
+        if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {
+            next;
+        }
+    
+        if ( (m/^=(over)/) .. (m/^=(back)/) ) {
+            next;
+        }
+        
+        # skip the data section
+        if (m/^__(DATA|END)__$/) {
+            last;
+        }
+    
+        # Each keyword can appear multiple times.  Don't
+        #  bother with datastructures to store these strings,
+        #  if we need to print it print it now.
+    
+        if ( m/^\s*\$RPM_Requires\s*=\s*["'](.*)['"]/i) {
+            foreach $_ (split(/\s+/, $1)) {
+                print "$_\n";
+                }
+        }
+
+        if ( 
 
 # ouch could be in a eval, perhaps we do not want these since we catch
@@ -160 +208 @@
 
 
-    (m/^(\s*)         # we hope the inclusion starts the line
-     (require|use)\s+(?!\{)     # do not want 'do {' loops
-     # quotes around name are always legal
-     [\'\"]?([^\;\ \'\"\t]*)[\'\"]?[\t\;\ ]
-     # the syntax for 'use' allows version requirements
-     \s*([.0-9]*)
-     /x)
-       ) {
-      my ($whitespace, $statement, $module, $version) = ($1, $2, $3,$4);
-      my $usebase;
-
-      # we only consider require statements that are flush against
-      # the left edge. any other require statements give too many
-      # false positives, as they are usually inside of an if statement
-      # as a fallback module or a rarely used option
-
-      ($whitespace ne "" && $statement eq "require") && next;
-
-      # if there is some interpolation of variables just skip this
-      # dependency, we do not want
-      #        do "$ENV{LOGDIR}/$rcfile";
-
-      ($module =~ m/\$/) && next;
-
-      # skip if the phrase was "use of" -- shows up in gimp-perl, et al
-      next if $module eq 'of';
-
-      # if the module ends in a comma we probaly caught some
-      # documentation of the form 'check stuff,\n do stuff, clean
-      # stuff.' there are several of these in the perl distribution
-
-      ($module  =~ m/[,>]$/) && next;
-
-      # if the module name starts in a dot it is not a module name.
-      # Is this necessary?  Please give me an example if you turn this
-      # back on.
-
-      #      ($module =~ m/^\./) && next;
-
-      # if the module ends with .pm strip it to leave only basename.
-      # starts with /, which means its an absolute path to a file
-      if ($module =~ m(^/)) {
-        print "$module\n";
-        next;
-      }
-
-      # as seen in some perl scripts
-      # use base qw(App::CLI Class::Accessor::Chained::Fast App::CLI::Command);
-      if ($module eq 'base') {
-      $require{$module} = $version;
-      $line{$module} = $current_line;
-      ($module = $_) =~ s/use\s*base\s*//;
-      $module =~ s/qw\((.*)\)\s*;/$1/;
-      $module =~ s/qw(.)(.*)\1\s*;/$2/;
-      $module =~ s/\s*;$//;
-      $module =~ s/#.*//;
-      $usebase = 1;
-      }
-      # sometimes people do use POSIX qw(foo), or use POSIX(qw(foo)) etc
-      # we can strip qw.*$, as well as (.*$:
-      $module =~ s/qw.*$//;
-      $module =~ s/\(.*$//;
-
-      $module =~ s/\.pm$//;
-
-      # some perl programmers write 'require URI/URL;' when 
-      # they mean 'require URI::URL;'
-
-      $module =~ s/\//::/;
-
-      # trim off trailing parenthesis if any.  Sometimes people pass
-      # the module an empty list.
-
-      $module =~ s/\(\s*\)$//;
-
-      # if module is a number then both require and use interpret that
-      # to mean that a particular version of perl is specified. Don't
-      # add a dependency, though, since the rpm will already require
-      # perl-base at the build version (via find-requires)
-      next if $module =~ /^v?\d/;
-
-      # ph files do not use the package name inside the file.
-      # perlmodlib  documentation says:
-      #       the .ph files made by h2ph will probably end up as
-      #       extension modules made by h2xs.
-      # so do not spend much effort on these.
-
-      # there is no easy way to find out if a file named systeminfo.ph
-      # will be included with the name sys/systeminfo.ph so only use the
-      # basename of *.ph files
-
-      ($module  =~ m/\.ph$/) && next;
-
-      # if the module was loaded trough base, we need to split the list
-      if ($usebase) {
-          my $current_line = $_;
-          foreach (split(/\s+/, $module)) {
-              next unless $_;
-              $require{$_} = $version;
-              $line{$_} = $current_line;
-          }
-      } else {
-      $require{$module}=$version;
-      $line{$module}=$current_line;
-      }
-    }
-  }
-
-  close(FILE) ||
-    die("$0: Could not close file: '$file' : $!\n");
+        (m/^(\s*)         # we hope the inclusion starts the line
+            (require|use)\s+(?!\{)     # do not want 'do bracket' loops
+            # quotes around name are always legal
+            [\'\"]?([^\;\ \'\"\t]*)[\'\"]?[\t\;\ ]
+            # the syntax for 'use' allows version requirements
+            \s*([.0-9]*)
+            /x)
+        ) {
+            my ($whitespace, $statement, $module, $version) = ($1, $2, $3,$4);
+            my $usebase;
+
+            # we only consider require statements that are flush against
+            # the left edge. any other require statements give too many
+            # false positives, as they are usually inside of an if statement
+            # as a fallback module or a rarely used option
+
+            ($whitespace ne "" && $statement eq "require") && next;
+    
+            # if there is some interpolation of variables just skip this
+            # dependency, we do not want
+            #        do "$ENV{LOGDIR}/$rcfile";
+    
+            ($module =~ m/\$/) && next;
+    
+            # skip if the phrase was "use of" -- shows up in gimp-perl, et al
+            next if $module eq 'of';
+    
+            # if the module ends in a comma we probaly caught some
+            # documentation of the form 'check stuff,\n do stuff, clean
+            # stuff.' there are several of these in the perl distribution
+    
+            ($module  =~ m/[,>]$/) && next;
+    
+            # if the module name starts in a dot it is not a module name.
+            # Is this necessary?  Please give me an example if you turn this
+            # back on.
+    
+            #      ($module =~ m/^\./) && next;
+    
+            # if the module ends with .pm strip it to leave only basename.
+            # starts with /, which means its an absolute path to a file
+            if ($module =~ m(^/)) {
+                print "$module\n";
+                next;
+            }
+    
+            # as seen in some perl scripts
+            # use base qw(App::CLI Class::Accessor::Chained::Fast App::CLI::Command);
+            if ($module eq 'base') {
+                $require{$module} = $version;
+                $line{$module} = $current_line;
+                ($module = $_) =~ s/use\s*base\s*//;
+                $module =~ s/qw\((.*)\)\s*;/$1/;
+                $module =~ s/qw(.)(.*)\1\s*;/$2/;
+                $module =~ s/\s*;$//;
+                $module =~ s/#.*//;
+                $usebase = 1;
+            }
+            # sometimes people do use POSIX qw(foo), or use POSIX(qw(foo)) etc
+            # we can strip qw.*$, as well as (.*$:
+            $module =~ s/qw.*$//;
+            $module =~ s/\(.*$//;
+    
+            $module =~ s/\.pm$//;
+    
+            # some perl programmers write 'require URI/URL;' when 
+            # they mean 'require URI::URL;'
+    
+            $module =~ s/\//::/;
+    
+            # trim off trailing parenthesis if any.  Sometimes people pass
+            # the module an empty list.
+        
+            $module =~ s/\(\s*\)$//;
+
+            # if module is a number then both require and use interpret that
+            # to mean that a particular version of perl is specified. Don't
+            # add a dependency, though, since the rpm will already require
+            # perl-base at the build version (via find-requires)
+            next if $module =~ /^v?\d/;
+
+            # ph files do not use the package name inside the file.
+            # perlmodlib  documentation says:
+            #       the .ph files made by h2ph will probably end up as
+            #       extension modules made by h2xs.
+            # so do not spend much effort on these.
+
+            # there is no easy way to find out if a file named systeminfo.ph
+            # will be included with the name sys/systeminfo.ph so only use the
+            # basename of *.ph files
+
+            ($module  =~ m/\.ph$/) && next;
+
+            # if the module was loaded trough base, we need to split the list
+            if ($usebase) {
+                my $current_line = $_;
+                foreach (split(/\s+/, $module)) {
+                    next unless $_;
+                    $require{$_} = $version;
+                    $line{$_} = $current_line;
+                }
+            } else {
+                $require{$module}=$version;
+                $line{$module}=$current_line;
+            }
+        }
     }
 
-  return(\%require);
-}
+close(FILE) || die("$0: Could not close file: '$file' : $!\n");
+}
+
+return(\%require);
+}

branches/3.1/mindi/mindi.conf

@@ -9 +9 @@
 # BOOT_SIZE=32768       # size of the boot disk
 # MINDI_ADDITIONAL_BOOT_PARAMS="devfs=nomount noresume selinux=0 barrier=off udevtimeout=10 acpi=off"
+# MINDI_DEFAULT_BOOT_OPTION="interactive ipconf=eth0:10.0.0.1:255.0.0.0:10.255.255.255:10.2.3.4"

branches/3.1/mindi/parted2fdisk.pl

@@ -9 +9 @@
 # Tested on ia64 with RHAS 2.1 - Mandrake 9.0 - RHEL 3.0 - SLES 10
 #
-# (c) Bruno Cornec <Bruno.Cornec@hp.com>
-# Licensed under the GPL
+# Copyright B. Cornec 2000-2013
+# Provided under the GPL v2
 
 use strict;
+
+
+=pod
+
+=head1 NAME
+
+parted2fdisk is a fdisk lie command using parted internally.
+
+=head1 DESCRIPTION
+
+parted2fdisk behaves like a fdisk command, but dialog internally with parted in order to manipulate partiion tables, which allow it to support GPT partition format as well as MBR, contrary to fdisk. It aimed at providing compatible external interface wti fdisk. Developed initialy for ia64 Linux, but is also useful now on x86 systems using GPT partition format (for large HDDs).
+
+=head1 SYNOPSIS
+
+parted2fdisk -s partition
+parted2fdisk -l device
+parted2fdisk [-n] device
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-s>
+
+Print the size (in blocks) of the given partition.
+
+=item B<-n>
+
+Fake mode. Doesn't pass the commands just simulate.
+
+=item B<-l>
+
+List the partition tables for the specified device and then exit.
+
+=item B<no option>
+
+Allow the creation and manipulation of partition tables.
+
+=back
+
+=head1 ARGUMENTS
+
+=over 4
+
+=item B<partition> 
+
+partition device file (only used with -s option).
+
+=item B<device> 
+
+device file to work on.
+
+=back
+
+=head1 WEB SITES
+
+The main Web site of the project is available at L<http://www.mondorescue.org>. Bug reports should be filled using the trac instance of the project at L<http://trac.mondorescue.org/>.
+
+=head1 USER MAILING LIST
+
+For community exchanges around MondoRescue please use the list L<http://sourceforge.net/mailarchive/forum.php?forum_name=mondo-devel>
+
+=head1 AUTHORS
+
+The MondoRescue team lead by Bruno Cornec L<mailto:bruno@mondorescue.org>.
+
+=head1 COPYRIGHT
+
+MondoRescue is distributed under the GPL v2.0 license or later,
+described in the file C<COPYING> included with the distribution.
+
+=cut
+
 
 $ENV{LANG} = "C";

branches/3.1/mindi/rootfs/etc/init.d/rcS

@@ -53 +53 @@
     mount / -o rw,remount > /dev/null 2> /dev/null
     LogIt "Launching Shell"
-    setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+    for i in `cat /proc/cmdline`; do
+        echo $i | grep -qi console= && console=`echo $i | cut -d= -f2`
+        echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2`
+    done
+    LogIt "Launching Shell"
+    if [[ $serial != "" && -e $serial ]]; then
+        setsid sh -c "exec sh <$serial >$serial 2>&1"
+    elif [[ $console != "" && -e $console ]]; then
+        setsid sh -c "exec sh <$console >$console 2>&1"
+    else
+        setsid sh -c "exec sh </dev/tty1 >/dev/tty1 2>&1"
+    fi
 }
 
@@ -95 +106 @@
     openvt $opt 7 /bin/sh /sbin/wait-for-petris
     openvt $opt 8 /usr/bin/tail -f $LOGFILE
+    openvt $opt 9 /usr/bin/tail -f /var/log/messages
     # May avoid shell error messages
     chmod 666 /dev/tty* /dev/console
@@ -130 +142 @@
     [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg 2>/dev/null | tr -s ' ' ' ' | cut -d' ' -f2`
     mt -f $tapedev rewind
+    if [ $? -ne 0 ]; then
+        LogIt "WARNING: $tapedev failed to rewind, either not a tape or still in OBDR mode." 1
+        LogIt "         Trying to find the corresponding SCSI generic device." 1
+        c=0
+        for d in `ls /sys/class/scsi_device/*`; do
+            devtype=`cat $d/device/type`
+            if [ _"$devtype" -eq _"1" ]; then
+                LogIt "NOTE: Device /dev/sg$c is a Sequential device." 1
+                if [ -x /usr/bin/sg_map ]; then
+                    dev=`/usr/bin/sg_map | grep -E "^/dev/sg$c" | awk '{print $2}'`
+                    LogIt "      Retry using device $dev" 1
+                fi
+            elif [ _"$devtype" -eq _"0" ]; then
+                # Skipping a HDD
+                /bin/true
+            elif [ _"$devtype" -eq _"5" ]; then
+                # Checking whether it's a CD or a tape in OBDR mode
+                grep -q -i -E 'dat|ultrium|tape' $d/device/model
+                if [ $? -eq 0 ]; then
+                    # Is probably a Tape drive left in OBDR.
+                    LogIt "Found that /dev/sg$c is a tape drive (`cat $d/device/model`)." 1
+                    grep -q -i -w 'hp' $d/device/vendor
+                    if [ $? -eq 0 ]; then
+                        LogIt "This is an HP tape drive, even better :-)." 1
+                    fi
+                    if [ -x /usr/bin/sg_reset ]; then
+                        OBDR_MODS="st mptsas mptspi aic7xxx aic94xx mpt2sas "
+                        if [ "`grep -i obdrmods /proc/cmdline`" ]; then
+                            OBDR_MODS="$OBDR_MODS `cat /proc/cmdline | sed 's~.*obdrmods=\"\(.*\)\".*~\1~'`"
+                        fi
+                        LogIt "Removing modules $OBDR_MODS." 1
+                        for m in $OBDR_MODS; do
+                            rmmod $i
+                        done
+                        LogIt "Trying to force device /dev/sg$c to be in sequential mode." 1
+                        /usr/bin/sg_reset -d /dev/sg$c
+                        LogIt "Inserting modules `rev $OBDR_MODS`." 1
+                        for m in `rev $OBDR_MODS`; do
+                            modprobe $i
+                        done
+                        LogIt "Retry again as the device has been set back into sequential mode." 1
+                        mt -f $tapedev fsf 2
+                        res=$?
+                        # exit the loop to continue and return if that previous mt failed. 
+                        # If it succeeded we transparently continue !!
+                        break
+                    else
+                        LogIt "WARNING: Unable to reset /dev/sg$c as the sg_reset command is not availble." 1
+                    fi
+                fi
+            else 
+                LogIt "Device /dev/sg$c has an unknown type $devtype." 1
+            fi
+            c=`expr $c + 1`
+        done
+
+        if [ $res -ne 0 ]; then
+            cd $old_pwd
+            return $res
+        fi
+    fi
+
     mt -f $tapedev fsf 2
     # 32k is DEFAULT_INTERNAL_TAPE_BLOCK_SIZE
@@ -150 +224 @@
 
     # Here we can add the USB storage module, it's working even with OBDR !
-    modprobe -q usb-storage
+    modprobe -q usb-storage 2> /dev/null
     # Tape takes some time to appear
     sleep 10
@@ -156 +230 @@
     UntarTapeStuff $tapedev
     res=$?
+    tapedev="default tape device"
     while [ "$res" -ne "0" ] ; do
         LogIt "$tapedev failed to act as extended data disk for booting." 1
-        LogIt "Please specify an alternate tape device," 1
+        LogIt "Please specify an alternate non-rewinding tape device, such as /dev/nst0" 1
         LogIt "or hit <Enter> to boot from another media." 1
         echo -en "---> "
@@ -198 +273 @@
     fi
     echo "Activating a potential USB Storage device"
-    modprobe -q usb-storage
+    modprobe -q usb-storage 2> /dev/null
     for i in 1 2 3 4 5 6 7 8 9 10 ; do
         sleep 1
@@ -322 +397 @@
     ps | grep -v grep |grep udevd 2> /dev/null 1> /dev/null
     if [ $? -ne 0 ]; then
-        /sbin/udevd --daemon &
+        if [ -x /sbin/udevd ]; then
+            /sbin/udevd --daemon &
+        elif [ -x /usr/bin/udevd ]; then
+            /usr/bin/udevd --daemon &
+        fi
         echo "Waiting for udev to start..."
         sleep 5
@@ -337 +416 @@
         /sbin/udevsettle --timeout=10
         LogIt "Discovering with udevsettle"
-    elif [ -x /sbin/udevadm ]; then
-        UdevadmTrigger
-        /sbin/udevadm settle --timeout=10
+    elif [ -x /sbin/udevadm ] || [ -x /usr/bin/udevadm ]; then
+        ua=`UdevadmTrigger`
+        $ua settle --timeout=10
         LogIt "Discovering with udevadm"
     fi
@@ -390 +469 @@
     return
 fi
-modprobe -q uhcd_hci
-modprobe -q usbhid
+modprobe -q uhcd_hci 2> /dev/null
+modprobe -q usbhid 2> /dev/null
 }
 
@@ -403 +482 @@
         LogIt "Scanning LVM's..." 1
         if which lvm ; then
-            modprobe -q dm-mod
-            modprobe -q dm_mod
+            modprobe -q dm-mod 2> /dev/null
+            modprobe -q dm_mod 2> /dev/null
             lvm vgscan --mknodes
         else
@@ -602 +681 @@
 # For technical reasons, some sets are as large as 16MB.
 # I am allowing 32MB because selective restore occupies a lot of space.
-    for size in 128m 64m 48m 40m 32m ; do
+    for size in 256m 128m 64m 48m 40m 32m ; do
         mount_cmd="mount /dev/shm -t tmpfs -o size=$size" ; # was 34m until 04/2003
         LogIt "Trying '$mount_cmd'"
@@ -651 +730 @@
 }
 
-
 EnableCcissIfAppropriate() {
     local f
@@ -668 +746 @@
 
     # Now engage all Smart Array controllers to detect attached devices
-    for f in /proc/driver/cciss/cciss* ; do
-        LogIt "Engaging $f"
-        echo "engage scsi" > $f
-        LogIt "...result=$?"
-    done
+    if [ -d  "/proc/driver/cciss" ]; then
+        for f in /proc/driver/cciss/cciss* ; do
+            LogIt "Engaging $f"
+            echo "engage scsi" > $f
+            LogIt "...result=$?"
+        done
+    fi
 }
 
@@ -685 +765 @@
         if [ $? -eq 0 ]; then
             echo "Forcing first $j..."
-            modprobe -q $j
+            modprobe -q $j 2> /dev/null
         fi
     done
@@ -701 +781 @@
         fi
         echo "Probing $j..."
-        modprobe -q $j
+        modprobe -q $j 2> /dev/null
     done
 }
@@ -707 +787 @@
 UdevadmTrigger() {
 
+# This function should just echo the return value $ua
+
 if [ -x /sbin/udevadm ]; then
-    v=`/sbin/udevadm --version`
-    if [ "$v" -ge "146" ]; then
-        /sbin/udevadm trigger --type=failed
+    ua="/sbin/udevadm"
+elif [ -x /usr/bin/udevadm ]; then
+    ua="/usr/bin/udevadm"
+else
+    LogIt "WARNING: Unable to find udevadm. Not triggering udev"
+    ua="/bin/true"
+fi
+
+v="`$ua --version`"
+
+if [ -x "$v" ]; then
+    LogIt "Triggering udev again..."
+    if [ "$v" -ge "146" -a "$v" -lt "174" ]; then
+        $ua trigger --type=failed
+    elif [ "$v" -lt "146" ]; then
+        $ua trigger --retry-failed
     else
-        /sbin/udevadm trigger --retry-failed
-    fi
-fi
+        LogIt "... not needed"
+    fi
+fi
+echo $ua
 }
 
@@ -730 +826 @@
     # (useful for rules creating network ifcfg files)
     if [ -e "/tmp/USE-UDEV" ] ; then
-        UdevadmTrigger
+        ua=`UdevadmTrigger`
     fi
 }
@@ -739 +835 @@
 MINDI_REV=PBREV
 trap CaughtSoftReset SIGTERM
-trap GetShell SIGINTR
+trap GetShell SIGINT
 LOGFILE=/var/log/mondorestore.log
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
@@ -907 +1003 @@
 dmesg >> $LOGFILE
 LogIt "-------------"
+LogIt "/proc/mdstat:" >> $LOGFILE
+LogIt "-------------"
+cat /proc/mdstat  >> $LOGFILE
+LogIt "-------------"
 LogIt "/proc/swaps:" >> $LOGFILE
 LogIt "-------------"
@@ -937 +1037 @@
 # Not sure it's still needed, but shouldn't hurt
 if [ -e "/tmp/USE-UDEV" ] ; then
-    UdevadmTrigger
+    ua=`UdevadmTrigger`
 fi
 if grep "backup-media-type" /tmp/mondo-restore.cfg > /dev/null 2> /dev/null ; then

branches/3.1/mindi/rootfs/etc/passwd

@@ -10 +10 @@
 man:x:13:15:man:/usr/man:
 guest:x:405:100:guest:/dev/null:/dev/null
+rpc:x:492:491:system user for rpcbind:/var/lib/rpcbind:/sbin/nologin
+rpcuser:x:491:490:system user for nfs-utils:/var/lib/nfs:/bin/false
 nobody:x:65534:100:nobody:/dev/null:

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

@@ -138 +138 @@
             ln -sf /dev/console /dev/tty
             sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
+        elif [ "$proto" = "smbfs" ]; then
+            LogIt "Mounting SMBFS share ($netfsmount) on /tmp/isodir..."
+            mount -t cifs $netfsopt $netfsmount /tmp/isodir -o ro 
         elif [ "$proto" != "" ]; then
+            if [ -x /sbin/rpcbind ]; then
+                "Startng rpcbind daemon..."
+                /sbin/rpcbind &
+            fi
             LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
             touch /etc/mtab