Changeset 2937 in MondoRescue

Timestamp:

Jan 28, 2012, 1:51:28 AM (13 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2849:2935 ../3.0

• Adds 3 binaries called potentially by udev o support USB key mount at restore time (Victor Gattegno)
• mindi only sets the boot flag of a USB device if none is present already (should avoid flip/flop situation)
• Fix a compatibility bug in analyze-my-lvm whete exclude lists with '|' was incorrectly analyzed (' ' still expected)
• Precise that -J is not supported by mondorestore yet.
• Fix a compatibility bug in mindi where exclude lists with '|' was incorrectly analyzed (' ' still expected)
• Install an MBR on USB devices when possible
• Improve error message in case mondorestore isn't found
• Adds support for more virtio devices for KVM restore
• Improve mbr.bin handling
• Fix an issue in test of FindKernel for Xen and non Xen cases
  • Fix #492 by removing an extra useless fi
  • Move fvat nd fat modules to CDROM_MODS in order to have them in the initrd to support saving logs to a USB device e.g.
  • Fix an error when dmidecode reports comments before system name
  • Fix previous broken patch on comment management for bkphw
  • Improve msgs printed during kbd analysis
  • Fix a small remaining pb with new comment support
  • Try to again improve the mount/umount stuff in mondo -Adds mention to OEL, CentOS, ScientifLinux as RHEL clones
• Fix a panadoid_free done on the wrong variable (solve a memory leak)
• Solve #495 by skipping the potential (auto-read-only) when analyzin /proc/mdstat result
• Fix some markup in man pages
• adds the post-nuke script sample for Debian (Guillaume Pernot/Andrée Leidenfrost)
• Avoid a useless umount when changing of afio set, let insist_on_cd check and perform if needed
• Copy everything under .ssh of root account to allow for sshfs mount without passwd at restore time.
• Adds support for bnx2i driver
• Try to fix #496 by supporting the protocol in the output of the mount command (sshfs#...)
• Uses the -d option of the mount command to avoid leaving loop devices in use. Probably provoked by the usage of a more recent busybox, but anyway that option doesn't hurt, and does nothing for non-loop devices. Should fix the problems reported on the ML with NFS and more than 8 ISO images (8 being the default number of loop devices available)
• Attempt to fix #436 by adding some newtDrawForm where appropriate.
• Fix bugs in the kernel detection routine of mindi (some echo were done without capturing their output, confusing the return). This should also help the Xen detection issue
• Change the logging function to be nearer from 2.2.10, and start using some
• Initialize some global fields with an empty string, now that newt Draws more regularly progress forms
• Mindi progression still not good, but showing now 3% when calling mindi. Would need a specific handling for the progress bar to evolve more afterwards
• Add compatibility with the latest SSSTK + PSP content for HP ProLiant + branding homogeneous now. We only take conrep out of the SSSTK pending a package availability. Using hpacuscripting now. Review of parameters called following test made.
• Fix #501 by pushing BOOT_SIZE to 36864 for certain Ubuntu cases
• Fix some remaining inconsistencis in the ProLiant HW backup. ready for usage.
• Fix an issue on udevadm call (needs an intermediate variable)
• Fix a remaining ProLiant tool call
• Remove again some wrong variable initialization for Net in order to not have strange messages now we call Draw more often
• Adds support for hwaddr (MAC addresses) at restore time, and map to the correct NIC if it's found at restore time (based on code from Stefan Heijmans)
• Try to Fix #499 by changing init in order to never exit, and rebooting using sysrq in /proc (not portable). Maybe should move to using a real init, and a separated rcS script.
• Fixes the shell msg error by using setsid as per Busybox FAQ
• Fix #491 by correctly checking Xen kernel used for a dom0 env (apollo13)
• Improves logging in Die()
• Improve again ProLiant HW support, by adding references to the yet to come SSSTK rpm so that conrep is called at its future right place.
• Improve mindi support for kernel 3.x
• Fix #499 for good, by using a real init from busybox and moving our init script to etc/init.d/rcS. We also now call the reboot from busybox to exit, which indeed reset the system correctly (in a VM at least which wasn't the case before). Reauires a new mindi-busybox as well.
• Attempt to solve #503 by handling /lib64 separately for udev and only if not a link (to /lib) for Ubuntu 64
• Improve again previous tests for bug #503
• Improve -d option description for NFS
• Allow http download for ftp content
• New italian mirror
• Fix #505 by documenting environment variables
  • Fix a bug where on OBDR mode compression was turned off to create the OBDR content but not back on (report from the mailing list)
• solve http://trac.mondorescue.org/ticket/520 by Victor Gattegno
• Fix #524 as option -U needs a size also
• Removes useless gendf option
• Fix #511 now stabgrub is called also after conf file modifications
• Adds support for SUID binaries
• remove a useless xenkernelname variable from mindi
• Should fix #512 by clearing old scratchdir before changing to a new
• Simplify the function engaging SCSI for Smart Array controllers, and support as many controller as we have
• Add some binaries used on SLES 10 by udev
• Fix a syntax issue in newt-specific.c
• Fix a memory free bug where a used variable was freed to early
• Fix a memory free bug where a used variable was misused in asprintf/free
• Fix #498 by using an external program (hpsa_obdr_mode) which can set the mode of the tape to CD-ROM or Sequential at will.

That program will have to be downloaded from ​http://cciss.sf.net

• Adds support for the route command in mindi-busybox
• Force block size back to 32768 in OBDR mode after skipping the 2 tape marks, to read the additional rootfs data corerctly - Fix #498 for good it seems
• Adds support for a new pata_atiixp driver
• Fix #525 and improve printing when no /etc/raidtab, but still md devices
• Exclude /run similarly to /sys and /proc
• Fix a bug in mindi when having multiple swap partiions with same starting string (/dev/dm-1 and /dev/dm-16). We now add a space in the grep to avoid mischoice.
• Fix grub installation if we had to go in the hack part which wasn't using the correct variables to make decisions !
• Remove all mention of mondorescue.com from code
• Fix some website typo on the download page and precise that we now develop on Mageia
• Exclude sysfs devpts and tmpfs partitions found in RHEL 6.2 from analyze by mindi (made error messages)
• Force activation of first partition which should not be optional as everything is destroyed before
• Fix a bug in analyze-my-lvm where LVs were created in random order (the one of lvscan) instead of using the dm-xxx order, which creates issues at restore time between the mapping created then and the one we had at backup time which could be inconssistent

-mondoarchive now exists if the mt command is missing when needed

• Proper fix for analyze-my-lvm
• Fix #500 and #473 by adding support of old metadata format for mdadm if using grub < 0.9x or lilo on a md boot device (to be tested)
• Really never inject or eject when the -e option is passed or device is inappropriate (USB, Net, ...)
• Fix #577 by having factor back as a float (not a long ! it's a decimal value) and making the appropriate cast.
• Fix #578 by improving the regexp used for CD/DVD detection with -scanbus option
• Adds more verbosity when LVM creation fails.
• Fix #579 by checking with pipes on both sides of the string
• debugfs should be excluded from the device considered for fstab analysis

Location:

branches/3.1

Files:

• mindi/README.ProLiant (copied) (copied from branches/2.2.9/mindi/README.ProLiant )
• mindi/README.bkphw (modified) (1 diff)
• mindi/README.bootparam (modified) (1 diff)
• mindi/README.proliant (deleted)
• mindi/README.pxe (modified) (3 diffs)
• mindi/analyze-my-lvm (modified) (7 diffs)
• mindi/deplist.d/ProLiant.conf (copied) (copied from branches/2.2.9/mindi/deplist.d/ProLiant.conf )
• mindi/deplist.d/base.conf (modified) (1 diff)
• mindi/deplist.d/minimal.conf (modified) (1 diff)
• mindi/deplist.d/proliant.conf (deleted)
• mindi/mindi (modified) (35 diffs)
• mindi/mindi-bkphw (modified) (3 diffs)
• mindi/proliant.files (deleted)
• mindi/rootfs/etc/init.d (copied) (copied from branches/2.2.9/mindi/rootfs/etc/init.d )
• mindi/rootfs/etc/init.d/rcS (modified) (3 diffs)
• mindi/rootfs/sbin/find-and-mount-cdrom (modified) (1 diff)
• mindi/rootfs/sbin/init (deleted)
• mindi/rootfs/sbin/install-additional-tools (modified) (2 diffs)
• mindi/rootfs/sbin/post-init (modified) (1 diff)
• mindi/rootfs/sbin/start-netfs (modified) (5 diffs)
• mondo-doc/mindi.8 (modified) (2 diffs)
• mondo-doc/mondoarchive.8 (modified) (22 diffs)
• mondo-doc/mondorescue-howto.sgml (modified) (1 diff)
• mondo-doc/mondorestore.8 (modified) (13 diffs)
• mondo/src/common/libmondo-archive.c (modified) (10 diffs)
• mondo/src/common/libmondo-cli.c (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (9 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (2 diffs)
• mondo/src/common/libmondo-files-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-files.c (modified) (5 diffs)
• mondo/src/common/libmondo-files.h (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (1 diff)
• mondo/src/common/libmondo-raid.c (modified) (1 diff)
• mondo/src/common/libmondo-stream.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (2 diffs)
• mondo/src/common/libmondo-verify.c (modified) (3 diffs)
• mondo/src/common/newt-specific.c (modified) (9 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (9 diffs)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (7 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (12 diffs)
• mondo/src/post-nuke.sample/usr/bin/Makefile.am (modified) (1 diff)
• mondo/src/post-nuke.sample/usr/bin/post-nuke.debian (copied) (copied from branches/2.2.9/mondo/src/post-nuke.sample/usr/bin/post-nuke.debian )
• mondo/src/restore-scripts/mondo/grub-MR (modified) (3 diffs)
• website/downloads.shtml (modified) (5 diffs)
• website/ftp (copied) (copied from branches/2.2.9/website/ftp )
• website/mondorescue.org.conf (modified) (11 diffs)

branches/3.1/mindi/README.bkphw

@@ -5 +5 @@
 Mindi has a script able to store the Hardware configuration and those parameters may be restored before launching mondorestore during the boot phase computed by mindi, in order to re-setup the machine as the original one.
 
-For the moment, only HP Proliant systems are supported. If you have tools to allow support for other type of machines, feel free to contribute patches to that script.
+For the moment, only HP ProLiant systems are supported. If you have tools to allow support for other type of machines, feel free to contribute patches to that script. For details on how to use ProLiant tools, please look at the README.ProLiant file
 
-If you have a Proliant system you first need to get the Smart Start Scripting Toolkit. Due to licenses issues, mindi cannot provide those tools itself. You need to get them from http://www.hp.com/servers/sstoolkit
-
-Mindi expects to find those tools under /usr/local/bin as described in the deplist.d/proliant.conf configuration file. Here are the steps to set it up correctly:
-
-Older URL:
-wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v40154/ss-scripting-toolkit-linux-1.70.tar.gz
-wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v43548/ss-scripting-toolkit-linux-1.81.tar.gz
-
-cd /tmp
-wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v44247/ss-scripting-toolkit-linux-1.90.tar.gz
-mkdir ssstk
-cd ssstk
-tar xvfz ../ss-scripting-toolkit-linux-1.90.tar.gz
-cp -a utilities/hponcfg /usr/local/bin
-cp -a utilities/conrep /usr/local/bin
-cp -a utilities/conrep.xml /usr/local/bin
-# For versions <= 1.90
-cp -a utilities/cpqacuxe/cpqacuxe /usr/local/bin
-cp -a utilities/cpqacuxe/bld /usr/local/bin
-mv /usr/local/bin/bld/*.so /usr/local/lib
-# For recent versions
-cp -a utilities/hpacucli /usr/local/bin
-echo /usr/local/lib >> /etc/ld.so.conf
-ldconfig
-
-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 directory of the file proliant.files is located]
-
-For these tools to work you may have to install additional packages such as hpasm and hprsm from the HP Web site, as well as some libstdc++ compatibility packages (compat-libstdc++-33 and compat-libstdc++-296 on RHEL 5 e.g.)
-
-In order to have a working hponcfg binary you also need to install the hprsm/hpasm packages from HP Web site. Refer to http://welcome.hp.com/country/us/en/support.html?pageDisplay=drivers
-
+2011-10-07 Move ProLiant section to a specific file
 2007-05-30 Initial file

branches/3.1/mindi/README.bootparam

@@ -40 +40 @@
 
 nohw
-    Do not call the mindi-rsthw script which try to restore also your BIOSes configuration (Proliant only)
+    Do not call the mindi-rsthw script which try to restore also your BIOSes configuration (ProLiant only for now)
 
 nolvm

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)] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
+        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=#] ...
 
 ipdev is the device name (e.g. eth2)
@@ -19 +19 @@
 gateway is the default gateway (e.g. 192.168.1.254)
 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)
 server is the ip addr of the Remote Network server
@@ -48 +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.
 
-Please report any problem around that tool to bruno@mondorescue.org
+Please report any problem around that tool to bruno_at_mondorescue.org
 
+2011-10-09 adds support for hwaddr
 2009-12-05 nfsopt added tp allow for custom options at mount time
 2009-09-09 Changed to netfs for multi protocol support (nfs, sshfs, ...)

branches/3.1/mindi/analyze-my-lvm

@@ -60 +60 @@
         done
         list_of_devices="`echo $l | sort -u`"
-        for ed in $MINDI_EXCLUDE_DEVS ; do
+        for ed in `echo $MINDI_EXCLUDE_DEVS | sed 's/|/ /g'`; do
             if  [ "`echo " $list_of_devices" | grep " $ed"`" != "" ]; then
                 echo "Not including device $LV_full_string as it was excluded"
@@ -159 +159 @@
 
     if [ "$MINDI_EXCLUDE_DEVS" ] ; then
-        for ed in $MINDI_EXCLUDE_DEVS ; do
+        for ed in `echo $MINDI_EXCLUDE_DEVS | sed 's/|/ /g'`; do
             if  [ "`echo " $list_of_devices" | grep " $ed"`" != "" ]; then
                 echo $current_VG >> $MINDI_TMP/excludedvgs
@@ -188 +188 @@
         list_of_devices="`echo $l | sort -u`"
         if [ "$MINDI_EXCLUDE_DEVS" ] ; then
-            for ed in $MINDI_EXCLUDE_DEVS ; do
+            for ed in `echo $MINDI_EXCLUDE_DEVS | sed 's/|/ /g'`; do
                 if  [ "`echo " $list_of_devices " | grep " $ed"`" != "" ]; then
                     skip=1
@@ -211 +211 @@
                 list_of_devices="`echo $l | sort -u`"
                 if [ "$MINDI_EXCLUDE_DEVS" ] ; then
-                    for ed in $MINDI_EXCLUDE_DEVS ; do
+                    for ed in `echo $MINDI_EXCLUDE_DEVS | sed 's/|/ /g'`; do
                         if  [ "`echo " $list_of_devices " | grep " $ed"`" != "" ]; then
                             skip=1
@@ -266 +266 @@
         skip=0
         if [ "$MINDI_EXCLUDE_DEVS" ] ; then
-            for ed in $MINDI_EXCLUDE_DEVS ; do
+            for ed in `echo $MINDI_EXCLUDE_DEVS | sed 's/|/ /g'`; do
                 if  [ "`echo " $rep " | grep " $ed"`" != "" ]; then
                     skip=1
@@ -291 +291 @@
 }
 
+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
+}
 
 ListAllLogicalVolumes() {
@@ -414 +421 @@
 echo ""
 echo "Finally, create the LV's (logical volumes)."
-all_logical_volumes=`ListAllLogicalVolumes`
+all_logical_volumes=`ListAllLogicalVolumesSortedBydm`
 for current_LV in $all_logical_volumes ; do
     ProcessLogicalVolume $current_LV

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

@@ -63 +63 @@
 /usr/bin/cmp
 /sbin/ctrlaltdel
-/usr/bin/halt
 /bin/dd
 /usr/bin/eject
 /usr/bin/env
 /sbin/halt
+/usr/bin/halt
 /sbin/ldconfig
 /usr/bin/wc

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

@@ -123 +123 @@
 /etc/sysconfig/udev
 /sbin/consoletype
+# On SLES 10
+/sbin/path_id
+/sbin/scsi_id
+/sbin/scsi_tur
+/sbin/hwup
 
 # Modules

branches/3.1/mindi/mindi

@@ -36 +36 @@
 
 EXTRA_SPACE=80152       # increase if you run out of ramdisk space
-BOOT_SIZE=32768         # size of the boot disk
+BOOT_SIZE=36864         # size of the boot disk
 
 PROMPT_MAKE_CD_IMAGE="yes"
@@ -54 +54 @@
     # If set to "no", the kernel is not a Xen kernel
     # If "yes", mindi will modify isolinux.cfg for the Xen kernel.
+xenkernelpath=""
  
 MY_FSTAB=/etc/fstab
@@ -60 +61 @@
 
 # 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 amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw blkbk virtio"
+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"
 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 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"
-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"
+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"
+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 vfat fat 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 xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 ocfs2 ocfs2_dlm ocfs2_nodemanager configfs"
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
@@ -72 +73 @@
 # Force some modules to be included
 FORCE_MODS=""
+
+# Find MBR in case of bootable USB device to build
+MBRFILE=/usr/lib/syslinux/mbr.bin
+[ ! -r "$MBRFILE" ] && MBRFILE=/usr/lib64/syslinux/mbr.bin
+[ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/syslinux/mbr.bin
+[ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib/syslinux/mbr.bin
+[ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib64/syslinux/mbr.bin
 
 LOGFILE=/var/log/mindi.log
@@ -132 +140 @@
 }
 
-LogIt() {
-    if [ -e /dev/stderr ] ; then
-        echo -e "$1" >> /dev/stderr
-    elif [ -e /usr/bin/logger ] ; then
-        /usr/bin/logger -s $1
-    fi
+LogOnly() {
     echo -e "$1" >> $LOGFILE
     if [ _"$2" != _"" ]; then
@@ -143 +146 @@
     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"
 }
 
@@ -369 +402 @@
         mkdir -p $bigdir/etc/console
         cp /etc/console/boottime.kmap.gz $bigdir/etc/console 2>> $LOGFILE
+        echo ""
         echo -e "$DONE"
         return 0
@@ -383 +417 @@
         mkdir -p $bigdir/etc/console-setup
         cp $kbdfile $bigdir/etc/console-setup 2>> $LOGFILE
+        echo ""
         echo -e "$DONE"
         return 0
@@ -439 +474 @@
     KBDEPTH=0
     AddKeyboardMappingFile $mappath
+    echo ""
     echo -e "$DONE"
     rm -f $MINDI_TMP/keymaps.find
@@ -453 +489 @@
     [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/share/lib64/syslinux/mboot.c32
     [ ! -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.com and click on 'Download'"
+    [ ! -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"
 }
@@ -465 +501 @@
     [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib64/syslinux/isolinux.bin
     [ ! -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.com and click on 'Download'"
+    [ ! -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" 
 }
@@ -704 +740 @@
 # $1: raid device (/dev/md...)
 GetRaidDevMembers() {
+    if [ ! -f /etc/raidtab ]; then 
+        return
+    fi
     $AWK "/^[[:space:]]*#/ {next} /^[[:space:]]*raiddev/ {if(dev) exit; if(\$2 == \"$1\") dev=\$2} /^[[:space:]]*device/ {if(dev) {print \$2}}" < /etc/raidtab
 }
@@ -977 +1016 @@
 
 MakeMountlist() {
-    local scratchdir mountlist all_partitions current_partition \
+    local mountlist all_partitions current_partition \
 partition_size partition_format outstring partition_number \
 partition_mountpt c_p lwm_info psz lvm_dev unofficial_outstring \
@@ -990 +1029 @@
     LogAll "-----------------------------------" 
 
-# scratchdir, mountlist(OUT)
-    scratchdir=$MINDI_TMP
+# mountlist(OUT)
     mountlist=$1
 
@@ -1019 +1057 @@
     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
-    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"
+    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
-        # Skip evices, network FS, cisf
+        # Skip fd/cd devices, network FS, cifs
         [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] || [ "`echo "$c_p" | grep -E "^//"`" != "" ]&& continue
         [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
@@ -1032 +1070 @@
         fi
         [ "$c_p" = "none" ] && continue
-        # Debian 5 does that
-        [ "$c_p" = "proc" ] && continue
         redhat_label=""
         label=""
@@ -1110 +1146 @@
                     [ "`echo $uname | grep "2.6.19"`" != "" ] && skip=1052
                     [ "`echo $uname | grep "2.6.[2-9]"`" != "" ] && skip=1052
+                    [ "`echo $uname | grep "3.[0-9]*.[0-9]*"`" != "" ] && skip=1052
                     if [ $skip = "" ]; then
                         Die "Your kernel is too old. I don't know how to support labelled swap spaces with it"
@@ -1218 +1255 @@
             list_of_devices="`echo $l | sort -u`"
 
-            for d in $MINDI_EXCLUDE_DEVS ; do
+            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
@@ -1268 +1305 @@
             [ "`echo "$current_partition" | grep -c "^/"`" -ne "1" ] && continue
             if [ "$partition_format" = "swap" ] || [ "$partition_mountpt" = "swap" ] ; then
-                partition_size=`grep -Fv "Priority" /proc/swaps | tr -s '\t' ' ' | grep -F "$current_partition" | $AWK '{print $3}'`
+                partition_size=`grep -Fv "Priority" /proc/swaps | tr -s '\t' ' ' | grep -F "$current_partition " | $AWK '{print $3}'`
                 [ "$partition_mountpt" != "swap" ] && partition_mountpt="swap"
                 [ "$partition_format" != "swap" ] && partition_format="swap"
@@ -1487 +1524 @@
     LogFile "Transforming $USBDEVICE in a Bootable device"  
     LogFile "Checking $USBDEVICE" 
-    $FDISK -l $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE
+    $FDISK -l $USBDEVICE 2>&1 >> $LOGFILE
     if [ $? -ne 0 ]; then
         LogAll "Unable to access $USBDEVICE" 
@@ -1499 +1536 @@
     # 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"
+        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" 
-    $FDISK $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE << EOF
+    cat > $MINDI_TMP/fdisk.txt << EOF
 d
 d
@@ -1516 +1560 @@
 w
 EOF
+    $FDISK $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE < $MINDI_TMP/fdisk.txt
     if [ $? -ne 0 ]; then
         LogAll "Unable to create a vfat Filesystem on $USBDEVICE" 
@@ -1522 +1567 @@
         MindiExit -1
     fi
+    LogFile "fdisk build file"
+    LogFile "----------------"
+    cat $MINDI_TMP/fdisk.txt >> $LOGFILE
+    LogFile "----------------"
+    rm -f $MINDI_TMP/fdisk.txt
     LogFile "The USB device $USBDEVICE now looks like this:" 
     $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
@@ -2023 +2073 @@
     local devpath drive res stub
     device=$1
+    if [ "`echo "$device" | grep -E "^/dev/"`" = "" ] ; then
+        Die "Cannot find $device's size - is your /etc/fstab sane?"
+    fi
     if [ "`echo "$device" | grep -F "/dev/md"`" != "" ] ; then
         res=`SizeOfRaidPartition $device`
@@ -2091 +2144 @@
 
 
+# WARNING: This function should just echo the final result !!!
+#
 TryToFindKernelPath() {
-    local fname incoming res fkern_ver we_want_version possible_kernels noof_kernels kernelpath kdate duff_kernels
+    local fname fkern_ver we_want_version possible_kernels noof_kernels possible_xenkernels noof_xenkernels kp kdate duff_kernels output root
 
     we_want_version=$KERVERRUN
     possible_kernels=""
     duff_kernels=""
+    output=""
    
     if [ "$ARCH" = "ia64" ] ; then
@@ -2104 +2160 @@
     fi
     # See if we're booted from a Xen kernel
-    if [ -d /proc/sys/xen ]; then
+    # From http://wiki.xensource.com/xenwiki/XenCommonProblems#head-26434581604cc8357d9762aaaf040e8d87b37752
+    if [ -f /proc/xen/capabilities ]; then
         # It's a Xen kernel
         KERNEL_IS_XEN="yes"
-        LogIt "It's a Xen kernel..."
+        LogFile "It's a Xen kernel..."
     fi
 
@@ -2168 +2225 @@
         fi
     elif [ "$noof_kernels" -eq "1" ] ; then
-        kernelpath=`echo "$possible_kernels" | sed s/' '//`
-        LogFile "Your kernel is $kernelpath (v$KERVERRUN)" 
-        output="$kernelpath"
+        kp=`echo "$possible_kernels" | sed s/' '//`
+        LogFile "Your kernel is $kp (v$KERVERRUN)"
+        output="$kp"
     else
         for i in $possible_kernels ; do
-            if echo $i | grep "$KERVERRUN" ; then
+            if [ "`echo $i | grep "$KERVERRUN"`" ]; then
                 LogAll "OK, I used my initiative and found that "
                 LogAll "$i is probably your kernel. "
                 output="$i"
+                break
             fi
         done
-        if [ -n "$output" ]; then
-            if echo " $possible_kernels " | grep -F "/boot/vmlinuz " &> /dev/null ; then
+        if [ ! -n "$output" ]; then
+            if [ "`echo " $possible_kernels " | grep -F "/boot/vmlinuz " &> /dev/null`" ]; then
                 output=/boot/vmlinuz
-                echo "Schlomo, this one's for you." >> $LOGFILE
+                LogFile "Schlomo, this one's for you."
             else
-                LogIt "Two or more possible kernels found. You may specify any one of them and the "
-                LogIt "boot disks will still work, probably. If one does not work, try another."
-                LogIt "$possible_kernels"
-                echo ""
+                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"
+                output=""
             fi
         fi
@@ -2196 +2254 @@
         elif [ "$noof_xenkernels" -eq "1" ]; then
             xenkernelpath=`echo "$possible_xenkernels" | sed s/' '//`
-            echo "Your Xen kernel is $xenkernelpath (v$KERVERRUN)" >> $LOGFILE
+            LogFile "Your Xen kernel is $xenkernelpath (v$KERVERRUN)"
         else
             for i in $possible_xenkernels ; do
-                    if echo $i | grep "$KERVERRUN" ; then
-                    LogIt "OK, I used my initiative and found that "
-                        LogIt "$i is probably your Xen kernel. "
+                if [ "`echo $i | grep "$KERVERRUN"`" ]; then
+                    LogFile "OK, I used my initiative and found that "
+                    LogFile "$i is probably your Xen kernel. "
                     xenkernelpath="$i"
+                    break
                 fi
             done
-            if [ -n "$xenkernelpath" ]; then
+            if [ ! -n "$xenkernelpath" ]; then
                 new_possible_xenkernels=`echo "$possible_xenkernels" | tr -s ' ' '\n' | grep -E "^/boot" | sort -u | tr '\n' ' '`
                 if [ ! -n "$new_possible_xenkernels" ]; then
                     xenkernelpath=`echo $new_possible_xenkernels | tr -s ' ' '\n' | head -1`
-                    LogIt "Using $xenkernelpath"
+                    LogFile "Using $xenkernelpath"
                 else
-                        LogIt "Two or more possible Xen kernels found. You may specify any one of them and the "
-                    LogIt "boot disks will still work, probably. If one does not work, try another."
-                        LogIt "$possible_xenkernels"
-                    echo ""
+                    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"
+                    output=""
                     xenkernelpath=`echo $possible_xenkernels | tr -s ' ' '\n' | head -1`
-                    LogIt "Using $xenkernelpath"
+                    LogFile "Using $xenkernelpath"
                 fi
             fi
         fi
-        xenkernelname=`basename $xenkernelpath`
         if [[ -z "$xenkernelpath" || ! -f "$xenkernelpath" ]]; then
             Die "Cannot find Xen kernel $xenkernelpath, aborting"
         fi
     fi
+    LogAll "TryToFindKernelPath found $output"
     echo "$output"
 }
@@ -2258 +2317 @@
     echo `cat $MINDI_TMP/mnt.lis` `sort -u $MINDI_TMP/deps.lis` >> $MINDI_TMP/cp.lis
     rm -f $MINDI_TMP/deps.lis $MINDI_TMP/mnt.lis
+
+    # Copy of files mandatory for ssh to automate mount if sshfs is used
+    echo .ssh >> $MINDI_TMP/mkdir.lis
+    echo ~root/.ssh/* >> $MINDI_TMP/cp.lis
+    echo > $mountpoint/tmp/myssh << EOF
+ssh -o StrictHostKeyChecking=no $*
+EOF
+    chmod 755 $mountpoint/tmp/myssh
+    echo $mountpoint/tmp/myssh >> $MINDI_TMP/cp.lis
 
     # Copy of files mandatory for ld.so
@@ -2279 +2347 @@
         # This avoids NIC remapping if on another machine at restore time on Ubuntu at least
         echo ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules >> $MINDI_TMP/rm.lis
+
+        # Do not do it if it's a link (Ubuntu 64 bits #503)
+        if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [  ! -h "/lib64/udev" ]; then
+            echo /lib64/udev >> $MINDI_TMP/mkdir.lis
+            echo /lib64/udev/* >> $MINDI_TMP/cp.lis
+        fi
+        if [ -e "/lib32/udev" ] && [ ! -h "/lib32" ] && [  ! -h "/lib32/udev" ]; then
+            echo /lib32/udev >> $MINDI_TMP/mkdir.lis
+            echo /lib32/udev/* >> $MINDI_TMP/cp.lis
+        fi
+        if [ -e "/lib/udev" ] && [ ! -h "/lib" ] && [  ! -h "/lib/udev" ]; then
+            echo /lib/udev >> $MINDI_TMP/mkdir.lis
+            echo /lib/udev/* >> $MINDI_TMP/cp.lis
+        fi
         if [ -x /sbin/udevd ]; then
             # Get only the files which exist in the udev.files list
@@ -2296 +2378 @@
     fi
 
-    # Management of potential HW info (Proliant only at the moment)
+    # Management of potential HW info (ProLiant only at the moment)
     rm -rf $MINDI_CACHE/bkphw
     mindi-bkphw $MINDI_CACHE $MINDI_CONF | tee -a $LOGFILE
@@ -2371 +2453 @@
         echo "lib/firmware" >> $MINDI_TMP/mkdir.lis 
         echo "/lib/firmware" >> $MINDI_TMP/cp.lis 
+    fi
+
+    # Copy an additional ProLiant tool for OBDR support
+    if [ -f $MINDI_TMP/OBDR ]; then
+        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"
+            LogAll "         This may lead to a tape not going back to sequential mode after OBDR boot"
+        fi
     fi
 
@@ -2418 +2512 @@
     # Finally remove useless stff
     (cd $mountpoint ; rm -f `cat $MINDI_TMP/rm.lis`) 2>&1 >> $LOGFILE 
-
-    # Copy of files mandatory for ssh to automate mount if sshfs is used
-    cp -rp ~root/.ssh/*.pub ~root/.ssh/config ~root/.ssh/known* $mountpoint/.ssh 2> /dev/null
-    cat > $mountpoint/bin/myssh << EOF
-ssh -o StrictHostKeyChecking=no $*
-EOF
-    chmod 755 $mountpoint/bin/myssh
 
     # Finally integrate what we provide statically as part of mindi
@@ -2695 +2782 @@
 if [ "$#" -ne "0" ] ; then
     if [ "$1" = "--findkernel" ] ; then
-        res=`TryToFindKernelPath`
+        resk=`TryToFindKernelPath`
         # Avoids logfile content for mondo
         export MONDO_SHARE=""
-        if [ "$res" = "" ] ; then
+        if [ "$resk" = "" ] ; then
             if [ $KERNEL_IS_XEN = "yes" ]; then
                 echo "$xenkernelpath"
-                MindiExit 0
+                LogOnly "xenkernelpath = $xenkernelpath"
+                MindiExit 0
             else
-                MindiExit -1
+                MindiExit -1
             fi
         else
-            echo "$res"
-            MindiExit 0
+            echo "$resk"
+            LogOnly "kernelpath = $resk"
+            MindiExit 0
         fi
     elif [ "$1" = "--locatedeps" ] ; then
@@ -2765 +2854 @@
         if [ $KERNEL_IS_XEN = "yes" ]; then
             LogAll "xenkernelpath = $xenkernelpath"
-            LogAll "xenkernelname = $xenkernelname"
         fi
         kernelname=`echo $kernelpath | cut -d'-' -f2- | sed 's/.[bg]z[2]*$//'`

branches/3.1/mindi/mindi-bkphw

@@ -11 +11 @@
 # Handling Configuration files
 my $tool = "";
-my $tooldir = "";
 my $ret = 0;
+my $productname = undef;
 
 die "No CACHE_DIR parameter" if ((not defined $ARGV[0]) || (! -d $ARGV[0]));
@@ -24 +24 @@
 mkdir $bkpdir,0755 if (! -d $bkpdir) ;
 open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "You need /usr/sbin/dmidecode for mindi hardware support";
-my $productname = <SYSTEM>;
+while (<SYSTEM>) {
+    next if (/^#/);
+    $productname = $_;
+    chomp($productname);
+    }
 close(SYSTEM);
 
-die "ERROR: No product name found for Hardware support\n" if (not defined $productname);
+die "WARNING: No product name found for Hardware support\n" if (not defined $productname);
 
-chomp($productname);
 if ($productname =~ /proliant/i) {
     print "Detected a $productname. Nice. Continue to support my job :-)\n";
-    print "Activating Proliant support for mindi\n";
-    open(PROLIANT,"$confdir/proliant.files") || die "Unable to open $confdir/proliant.files";
+    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";
+    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
     open(TOOLS,"> $bkpdir/../tools.files") || die "Unable to open $bkpdir/../tools.files";
+    # generate a script that will be launched at rstore time to perform the HW setup
     open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "Unable to open $bkpdir/../mindi-rsthw";
     print SCRIPT  << 'EOF';
 #!/bin/bash
 #
+# Script generated by mindi
+#
 # This script will restore potentially your HW configuration
-# on your system before partioning occurs
+# on your system before partioning occurs.
+#
 # You may want to reboot after that step if you think that
 # resetting BIOS parameters to the value restored
-# may have an impact on you restoration process
+# may have an impact on your restoration process or if
+# you want to benefit from any firmware update that could have happened.
 #
-# put dynamic libraries at an accessible place
-for l in /usr/local/lib/*; do
-    ln -sf $l /usr/lib
-done
 EOF
     while($tool = <PROLIANT>) {
+        my $hasfound = 0;
         next if ($tool =~ /^#/);
         chomp($tool);
-        $tooldir = dirname($tool);
+        # skip non-executable/exising binaries
         if (! (-x $tool)) {
-            print "You could install the SmartStart Scripting toolkit tool $tool\nto benefit from mindi's enhanced hardware support\n";
-            print "Get it from http://www.hp.com/servers/sstoolkit\n";
             next;
         } else {
-            print "Found $tool, activating enhanced HP Proliant support in mindi\n";
+            print "Found $tool, activating enhanced HP ProLiant support in mindi\n";
             print TOOLS "$tool\n";
         }
         if ($tool =~ /\/conrep$/) {
-            $ret = system("cd $tooldir ; $tool -s -f$bkpdir/conrep.dat");
-            print SCRIPT "(cd $tooldir ; $tool -l -f$locbkpdir/conrep.dat)\n";
+            # 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");
+            # 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;
+            }
+            print SCRIPT "$tool -l -f$locbkpdir/conrep.dat\n";
             print TOOLS "$tool.xml\n";
         }
-        if ($tool =~ /\/.acuxebin$/) {
+        if ($tool =~ /\/hpacuscripting$/) {
+            $hasfound = 1;
             my $dir=basename($tool);
-            $ret = system("export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -c $bkpdir/cpqacuxe.dat");
-            print SCRIPT "export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -i $locbkpdir/cpqacuxe.dat\n";
-            print TOOLS "$tooldir/bld\n";
-        }
-        if ($tool =~ /\/hpacucli$/) {
-            my $dir=basename($tool);
-            $ret = system("export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -c $bkpdir/hpacucli.dat");
-            print SCRIPT "export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -i $locbkpdir/hpacucli.dat\n";
-            print TOOLS "$tooldir/bld\n";
+            # Just backup internal info for a DR
+            $ret = system("$tool -c $bkpdir/hpacuscripting.dat -internal");
+            # We could want to reset it before.
+            print SCRIPT "# $tool -reset -i $locbkpdir/hpacusripting.dat\n";
+            print SCRIPT "$tool -i $locbkpdir/hpacusripting.dat\n";
         }
         if ($tool =~ /\/hponcfg$/) {
-            $ret = system("$tool -w $bkpdir/hponcfg.dat");
-            print SCRIPT "$tool -r $locbkpdir/hponcfg.dat\n";
+            $ret = system("$tool -a -w $bkpdir/hponcfg.dat");
+            print SCRIPT "$tool -f $locbkpdir/hponcfg.dat\n";
         }
         if ($tool =~ /\.scexe$/) {
-            print "Found $tool, that firmware will be applied at restore time on your HP Proliant\n";
-            print SCRIPT "./$tool\n";
+            print "Found $tool, that firmware will be applied at restore time on your HP ProLiant\n";
+            print SCRIPT "./$tool -s\n";
+        }
+        # Kept for compatibility with older version of tools
+        if (($tool =~ /\/hpacucli$/) && ($hasfound == 0)) {
+            my $dir=basename($tool);
+            $ret = system("$tool -c $bkpdir/hpacucli.dat");
+            print SCRIPT "$tool -i $locbkpdir/hpacucli.dat\n";
         }
         if ($ret != 0) {
@@ -96 +115 @@
 } else {
     print "\nWARNING: No Hardware support for $productname.\nNot a big issue, just less features and risks ;-)\n";
-    print "You may ask your manufacturer to contribute to the mindi project\n";
+    print "You may ask your manufacturer to contribute to the mindi project (harmless)\n";
 }
 rmdir $bkpdir if (-d $bkpdir) ;

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

@@ -131 +131 @@
     mt -f $tapedev rewind
     mt -f $tapedev fsf 2
+    # 32k is DEFAULT_INTERNAL_TAPE_BLOCK_SIZE
+    mt -f $tapedev setblk 32768
     dd if=$tapedev bs=32k count=1024 | tar -zx
     res=$?
@@ -651 +653 @@
 
 EnableCcissIfAppropriate() {
-    local i fname
-    for i in 0 1 2 3 ; do
-        fname="/proc/driver/cciss/cciss$i"
-        if [ -e "$fname" ] ; then
-            LogIt "Engaging $fname"
-            echo "engage scsi" > $fname
-            LogIt "...result=$?"
-        fi
+    local f
+
+    # In some cases, the OBDR tape remains in CD-ROM mode. This branch solves that issue (#498)
+    if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg 2>/dev/null`" ] && [ -x /usr/bin/hpsa_obdr_mode ]; then
+        for lun in `/usr/bin/hpsa_obdr_mode -m query /dev/cciss/* 2>&1 | grep "is an OBDR device" | cut -d' ' -f4`; do
+            /usr/bin/hpsa_obdr_mode -m query -l $lun /dev/cciss/* 2>&1 | grep -q "is in CD-ROM mode"
+            if [ $? -eq 0 ]; then
+                # This tape/lun should be brought back in Sequential mode
+                LogIt "Putting back tape $lun in Sequential mode..."
+                /usr/bin/hpsa_obdr_mode -m tape -l $lun /dev/cciss/* 2>&1 > /dev/null
+            fi
+        done
+    fi
+
+    # 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
 }
@@ -743 +756 @@
 done
 #/bin/update
+mkdir /proc 2> /dev/null
 mount /proc/ /proc -v -t proc 
 mkdir /sys 2> /dev/null

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

@@ -33 +33 @@
         fi
         LogIt "$device has a CD-ROM in it"
-        umount /mnt/cdrom
+        umount -d /mnt/cdrom
         ln -sf $device /dev/cdrom
         if [ "$?" -ne "0" ]; then

branches/3.1/mindi/rootfs/sbin/install-additional-tools

@@ -4 +4 @@
 #
 ########################################################################
-
-
-Die() {
-    echo "Fatal error! $1" >> /dev/stderr
-    exit 1
-}
-
 
 
@@ -60 +53 @@
     cd $old_pwd
     echo -e -n "\r"
-    [ ! -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] && [ -e "$tarball" ] && umount $mountpoint
+    [ ! -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] && [ -e "$tarball" ] && umount -d $mountpoint
     sleep 1
 fi

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

@@ -26 +26 @@
 else
     if [ "$iso$nuke$compare$interactive$pxe" != "" ] ; then
-        LogIt "FYI, this CD was made by Mindi, not Mondo." 1
+        LogIt "The mondorestore command was not found on your backup media" 1
+        LogIt "It may mean your device is not seen correctly." 1
+        LogIt "Check driver list and error messages." 1
         exit 0
     else

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

@@ -10 +10 @@
 ipcount=3
 
-ipconf=""
-pre=""
-post=""
+# Get info from config file
 ipdev=""
+hwaddr=""
 ipaddress=""
 ipnetmask=""
@@ -19 +18 @@
 ipgateway=""
 proto=""
+ipconf=""
+pre=""
+post=""
 netfsmount=""
 imgname=""
@@ -26 +28 @@
 if [ -f $MINDI_CACHE/mondorestore.cfg ]; then
     ipdev=`grep netfs-dev $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    hwaddr=`grep netfs-client-hwaddr $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
     ipaddress=`grep netfs-client-ipaddr $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
     ipnetmask=`grep netfs-client-netmask $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
@@ -46 +49 @@
 for i in `cat $CMDLINE` ; do
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
+    echo $i | grep -qi hwaddr= && hwaddr=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
     echo $i | grep -qi netfsmount= && export netfsmount=`echo $i | cut -d= -f2`
@@ -93 +97 @@
             ipgateway=`echo $ipconf | cut -d: -f5`
         fi
+
+        # If same system, map to the right MAC address
+        hwaddr_found=`ifconfig $ipdev | /bin/grep HWaddr | awk '{print $NF}'`
+        if [ "$hwaddr" != "$hwaddr_found" ]; then
+            ipdev_new=`ifconfig -a | /bin/grep $hwaddr | awk '{print $1}'`
+            if [ "$ipdev_new" != "" ]; then
+                LogIt "Interface $ipdev changed to $ipdev_new (MAC: $hwaddr)"
+                ipdev=$ipdev_new
+            else
+                LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+            fi
+        fi
+
         LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
         ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
         route add default gw $ipgateway
+
     fi
+
+    # Leave time to the satck to wake up (reported by some users)
+    sleep 5
 
     # ping server helps waking interface up

branches/3.1/mondo-doc/mindi.8

@@ -27 +27 @@
 .B mindi
 .br
-.BR "mindi -v"| " --version"| " -V"| " -version"
+.BR "mindi \-v"| " --version"| " \-V"| " -version"
 .br
 .BI "mindi --findkernel"
@@ -64 +64 @@
 .SH OPTIONS
 .TP
-.BI "-v"| " --version"| " -V"| " -version"
+.BI "\-v"| " --version"| " \-V"| " -version"
 .RI Prints the version of mindi.
 .TP

branches/3.1/mondo-doc/mondoarchive.8

@@ -114 +114 @@
 Use ISO files (CD images) as backup media. This is good for backing up your
 system to a spare hard drive. The
-.B -n
+.B \-n
 switch is a wiser choice if you plan to restore from a remote filesystem.
 
@@ -161 +161 @@
 This is the prefered and recommended option when doing partial archiving.
 Note that mondo automatically excludes removable media (/mnt/floppy,
-/mnt/cdrom, /proc, /sys, /tmp). For example, if you are backing up to an NFS mount but you
+/mnt/cdrom, /proc, /sys, /run, /tmp). For example, if you are backing up to an NFS mount but you
 do not want to include the contents of the mount in a backup, exclude your
 local mount-point with this switch. It will also work with partitions, e.g.
@@ -173 +173 @@
 
 .TP
-.BI "-I " "\*(lqpath|...\*(rq"
+.BI "\-I " "\*(lqpath|...\*(rq"
 Include paths(s) in backup. The paths should be separated with a pipe and surrounded by quotes.
 This option is mainly used to perform tests
@@ -186 +186 @@
 .BR \-E
 option, the \-E content should be subdirectories of those mentioned in
-the \-I only, as -I takes precedence.
-
-.TP
-.BI "-J " "file"
+the \-I only, as \-I takes precedence.
+
+.TP
+.BI "\-J " "file"
 Specify an explicit list of files and directories to include in a plain text file, one item
 (file or directory) per line. Beware that directories placed in that file are not managed recursively contrary to what is done with the \-I option.
 
 .TP
-.BI "-N"
+.BI "\-N"
 Exclude all mounted network filesystems. This currently means NFS, SMB, Coda, MVFS, AFS
 OCFS and Netware. In other words, only backup the local hard disk(s).
 
 .TP
-.BI "-d " "dev|dir"
+.BI "\-d " "dev|dir"
 Specify the backup device (CD/tape/USB) or directory (NFS/ISO). For CD-R[W] drives,
 this is the SCSI node where the drive may be found, e.g. '0,1,0'. For tape
@@ -205 +205 @@
 this is the device name of your key or external disk. For ISO users,
 this is the directory where the ISO images are stored. For NFS users, this is
-the directory within the NFS mount where the backups are stored. The default
+the subdirectory under the NFS mount where the backups are stored. The default
 for ISO and NFS is '/var/cache/mondo'.
 
 .TP
-.BI "-g "
+.BI "\-g "
 GUI mode. Without this switch, the screen output of mondoarchive is suitable
 for processing by an 'expect' wrapper, enabling the user to backup nightly via
@@ -216 +216 @@
 
 .TP
-.BI "-k " "path"
+.BI "\-k " "path"
 Path of user's kernel. If you are a Debian (<3.0) or Gentoo (<1.4) user then specify
 .B \-k FAILSAFE
@@ -222 +222 @@
 
 .TP
-.BI "-m "
+.BI "\-m "
 Manual (not self-retracting) CD trays are often found on laptops. If you are
 a laptop user, your CD burner has BurnProof technology or you experience
@@ -228 +228 @@
 
 .TP
-.BI "-o "
+.BI "\-o "
 Use OBDR (One Button Disaster Recovery) type of tapes.
 By default, tapes are not bootable. With this flag, tape will be made bootable
@@ -234 +234 @@
 
 .TP
-.BI "-s " "size"
+.BI "\-s " "size"
 How much can each of your backup media hold? You may use 'm' and 'g' on the end
 of the number, e.g. '700m' for an extra-large CD-R. You no longer need to
@@ -240 +240 @@
 
 .TP
-.BI "-x " "'dev ...'"
+.BI "\-x " "'dev ...'"
 Specify non-Linux partitions which you want to backup, e.g. NTFS or BeOS.
 
@@ -246 +246 @@
 .SH MINOR OPTIONS
 .TP 13
-.BI "-[0-9] "
+.BI "\-[0-9] "
 Specify the compression level. Default is 3. No compression is 0.
 
 .TP
-.BI "-A " "command"
+.BI "\-A " "command"
 This command will be called after each CD/NFS/ISO file is written. It is useful
 if you want to do something with an ISO after creating it, e.g. write it to a
 CD burner using a non-standard command.
-.B -A
+.B \-A
 understands two tokens \- _ISO_ and _CD#_ - which will be translated into the
 ISO's filename and its index number (1, 2, ...) respectively. So, you could use
@@ -267 +267 @@
 
 .TP
-.BI "-H "
+.BI "\-H "
 When you boot from the tape/CD, your hard drive will be wiped and the archives
 will be restored. Your decision to boot from the tape/CD will be taken as
@@ -274 +274 @@
 
 .TP
-.BI "-L "
+.BI "\-L "
 Use lzo, a fast compression engine, instead of bzip2. You may find lzo on
 Mondo's website or via FreshMeat. WARNING! Some versions of LZO are unstable.
 
 .TP
-.BI "-G "
+.BI "\-G "
 Use gzip, the standard and quicker Linux compression engine, instead of bzip2.
 
 .TP
-.BI "-Y "
+.BI "\-Y "
 Use lzma, the new quicker and optimized Linux compression engine, instead of bzip2.
 
 .TP
-.BI "-R "
+.BI "\-R "
 EXPERIMENTAL. Do not use in mission-critical environments. Star is an
 alternative to afio. Mondo now supports POSIX ACLs and extended
@@ -293 +293 @@
 
 .TP
-.BI "-P " "tarball"
+.BI "\-P " "tarball"
 Post-nuke tarball. If you boot into Nuke Mode and everything is restored
 successfully then the
@@ -304 +304 @@
 
 .TP
-.BI "-S " "path"
+.BI "\-S " "path"
 Specify the full pathname of the scratchdir, the directory where ISO
 images are built before being archived. If you have plenty of RAM and
@@ -310 +310 @@
 
 .TP
-.BI "-T " "path"
+.BI "\-T " "path"
 Specify the full pathname of the tempdir, the directory where temporary
 files (other than ISO images being assembled) are stored. See
@@ -316 +316 @@
 
 .TP
-.BI "-W "
+.BI "\-W "
 Don't make your backup self-booting. This is a really bad idea, IMO. Don't do
 this unless you have really great boot disks in your hand and you are an anally
@@ -323 +323 @@
 
 .TP
-.BI "-b "
+.BI "\-b "
 Specify the internal block size used by the tape drive. This is usually 32K but
 some drives just don't like that. They should but they don't. That's what
@@ -330 +330 @@
 
 .TP
-.BI "-e "
+.BI "\-e "
 Don't eject the CD or tape when backing up...
 
 .TP
-.BI "-f " "device"
+.BI "\-f " "device"
 Specify the drive on which your Master Boot Record lives. Usually, this is
 discovered automatically. A good use case may be when you have software RAID.
 
 .TP
-.BI "-l " "GRUB|LILO|ELILO|RAW"
+.BI "\-l " "GRUB|LILO|ELILO|RAW"
 Specify the boot loader. By default, your Master Boot Record is examined and
 the boot loader can usually be discovered. If you specify RAW then the MBR will
@@ -347 +347 @@
 
 .TP
-.BI "-Q "
+.BI "\-Q "
 Give more detailed information about the boot loader.
 
 .TP
-.BI "-K " "loglevel"
+.BI "\-K " "loglevel"
 Specify the loglevel. Use 99 for full debug. Standard debug level is 4.
 
 .TP
-.BI "-v "
+.BI "\-v "
 Gives mondoarchive version.
 
 .TP
-.BI "-z "
+.BI "\-z "
 Use extended attributes and acl for each file and store them in the
 backup media. Use this option if you use SElinux e.g. but it will slow
@@ -377 +377 @@
 support questions.
 
+.SH ENVIRONMENT VARIABLES
+.IR ARCH
+This variable is passed to the environment by mondoarchive so that 
+parted2fdisk.pl is aware of the underlying hardware architecture.
+
+.IR MONDO_SHARE
+This variable is passed to the environment by mondoarchive so that 
+mindi is aware that it's called from it and act accordingly. It contains
+the shared directory for the mondo package.
+
+.IR PATH
+This variable is modified internally by mondoarchive so that /sbin:/usr/sbin:/usr/local/sbin
+are appended to it systematically in order to find the required tools.
+
+.IR TMPDIR
+This variable is used, if defined, as the target directory to create 
+all the temporary files needed during the operation (not the scratch files)
+
+.IR TMP
+This variable is used, if defined and if TMPDIR is not defined, as the target 
+directory to create all the temporary files needed during the operation 
+(not the scratch files)
 
 .SH NOTES
@@ -450 +472 @@
 
 .BI USB:
-Backup to your USB key, using gzip compression:
-.br
-.I "mondoarchive -OU -d /dev/sda -G"
+Backup to your 4GB USB key, using gzip compression:
+.br
+.I "mondoarchive -OU -d /dev/sda -s 4g -G"
 
 .BI RAID:

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

@@ -322 +322 @@
 </entry>
 <entry>
-If you want to backup the whole computer (excluding /sys and /proc,
-naturally) then leave this as / which is the default. Otherwise,
+        If you want to backup the whole computer (excluding /sys, /run and /proc,
+        naturally as well as /tmp) then leave this as / which is the default. Otherwise,
 specify subsets, (e.g. /usr/local /home ) being sure to put a space
 in between each path.

branches/3.1/mondo-doc/mondorestore.8

@@ -41 +41 @@
 
 .TP
-.BI "-p " prefix
+.BI "\-p " prefix
 Use
 .B prefix
@@ -52 +52 @@
 
 .TP
-.BI "-i "
+.BI "\-i "
 Use ISO files (CD images) as restore media. This is good when having backed up your
 system to a spare hard drive. The
@@ -59 +59 @@
 
 .TP
-.BI "-n " mount
+.BI "\-n " mount
 Use files residing on NFS partition as restore media.
 .I mount
@@ -66 +66 @@
 
 .TP
-.BI "-t "
+.BI "\-t "
 Use tape streamer as restore device and its tapes as restore media.
 
 .TP
-.BI "-U "
+.BI "\-U "
 Use a generic USB device as restore device. Use this if you want to read
 your backup from a USB key or USB disk.
@@ -79 +79 @@
 
 .TP
-.BI "-u "
+.BI "\-u "
 Use a generic streaming device as restore device. Use this if you want to read
 your backup from a device that is not directly support by mondoarchive. This will
@@ -86 +86 @@
 
 .TP
-.BI "-E " "\*(lqpath ...\*(rq"
+.BI "\-E " "\*(lqpath ...\*(rq"
 Exclude path(s) from restore (future dev). The paths should be separated with a pipe.
 For example, if you are restoring up
@@ -92 +92 @@
 
 .TP
-.BI "-I " "\*(lqpath ...\*(rq"
+.BI "\-I " "\*(lqpath ...\*(rq"
 Include paths(s) to restore (future dev).
 
 .TP
-.BI "-J " "file"
+.BI "\-J " "file"
 Specify an explicit list of files and directories to restore in a plain
 text file, one item (file or directory) per line. Beware that
 directories placed in that file are not managed recursively contrary to
-what is done with the \-I option.
-
-.TP
-.BI "-d " "dev|dir"
+what is done with the \-I option (future dev).
+
+.TP
+.BI "\-d " "dev|dir"
 Specify the restore device (CD/tape/USB) or directory (NFS/ISO). For CD-R[W] drives,
 this is the SCSI node where the drive may be found, e.g. '0,1,0'. For tape
@@ -113 +113 @@
 
 .TP
-.BI "-g "
+.BI "\-g "
 GUI mode. Without this switch, the screen output of mondorestore is text based.
 
 .TP
-.BI "-m "
+.BI "\-m "
 Manual (not self-retracting) CD trays are often found on laptops. If you are
 a laptop user, your CD burner has BurnProof technology or you experience
@@ -123 +123 @@
 
 .TP
-.BI "-o "
+.BI "\-o "
 Use OBDR (One Button Disaster Recovery) type of tapes.
 By default, tapes are not bootable. With this flag, tape will be read as bootable tapes
@@ -129 +129 @@
 
 .TP
-.BI "-x " "'dev ...'"
+.BI "\-x " "'dev ...'"
 Specify non-Linux partitions which you want to restore (future dev).
 
 .TP
-.BI "-T " "path"
+.BI "\-T " "path"
 Specify the full pathname of the tempdir, the directory where temporary files
 are stored.
 
 .TP
-.BI "-b "
+.BI "\-b "
 Specify the internal block size used by the tape drive. This is usually 32K but
 some drives just don't like that. They should but they don't. That's what
@@ -145 +145 @@
 
 .TP
-.BI "-e "
+.BI "\-e "
 Don't eject the CD or tape when restoring...
 
 .TP
-.BI "-f " "device"
+.BI "\-f " "device"
 Specify the drive on which your Master Boot Record lives. Usually, this is
 discovered automatically. (future dev)
 
 .TP
-.BI "-Q "
+.BI "\-Q "
 Give more detailed information about the boot loader.
 
 .TP
-.BI "-K " "loglevel"
+.BI "\-K " "loglevel"
 Specify the loglevel. Use 99 for full debug. Standard debug level is 4.
 
 .TP
-.BI "-z "
+.BI "\-z "
 Use extended attributes and acl for each file and store them in the
 backup media. Use this option if you use SElinux e.g. but it will slow
@@ -168 +168 @@
 
 .TP
-.BI "-Z "
+.BI "\-Z "
 Specify mondorestore mode. Mode could be one of
 .IR nuke:
@@ -196 +196 @@
 and moved under /var/log at the end.
 
+.SH ENVIRONMENT VARIABLES
+.IR TMPDIR
+This variable is used, if defined, as the target directory to create 
+all the temporary files needed during the operation (not the scratch files)
+
+.IR TMP
+This variable is used, if defined and if TMPDIR is not defined, as the target 
+directory to create all the temporary files needed during the operation 
+(not the scratch files)
+
+.IR dirimg
+This variable is setup by the rcS script to store the network remote directory in PXE mode.
+(managed internally)
+
+.IR imgname
+This variable is setup by the rcS script to overwrite the prefix name in PXE mode.
+(managed internally)
+
+.IR netfsmount
+This variable is setup by the rcS script to store the network file system mount point in PXE mode.
+(managed internally)
+
+.IR MRUSBDEV
+This variable contains the device file of the USB device to restore from.
+(equivalent if the usb-dev parameter of the mondorescue config file)
+
 .SH NOTES
 A link to Mondo's HTML-based manual (by Bruno Cornec, Mikael Hultgren,

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

@@ -483 +483 @@
  * - @c compression_level
  * - @c differential
- * - @c exclude_paths
  * - @c image_devs
  * - @c kernel_path
@@ -610 +609 @@
 
     if (!bkpinfo->nonbootable_backup && (bkpinfo->boot_loader == '\0' || bkpinfo->boot_device == NULL)) {
+        update_evalcall_form(2);
 
 #ifdef __FreeBSD__
@@ -782 +782 @@
     mr_free(command);
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
+    update_evalcall_form(3);
 
     /*                          1           2  3          4    5    6    7   8    9    10 */
@@ -832 +833 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Calling MINDI to create boot+data disks");
+    open_evalcall_form("Calling MINDI to create boot+data disks");
     res = run_external_binary_with_percentage_indicator_NEW("Generating boot+data disks", command);
+    update_evalcall_form(99);
     paranoid_free(command);
 
@@ -874 +877 @@
         mr_free(tmp);
     }
+    close_evalcall_form();
     return (res);
 }
@@ -1471 +1475 @@
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
@@ -1499 +1503 @@
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
+
 
     /* Mindi always create one single parition on the USB dev */
@@ -1595 +1600 @@
     log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
@@ -2599 +2604 @@
 
     if (!ok_go_ahead_burn_it) {
-        eject_device(cdrom_dev);
+        if (!bkpinfo->please_dont_eject) {
+            eject_device(cdrom_dev);
+        }
         mds = media_descriptor_string(g_backup_media_type);
         mr_asprintf(tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", mds, g_current_media_number, mds);
@@ -3254 +3261 @@
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
 //    if (bkpinfo->backup_media_type != iso && !bkpinfo->please_dont_eject_when_restoring)
-//{
-        eject_device(bkpinfo->media_device);
-//}
+        if (!bkpinfo->please_dont_eject) {
+            eject_device(bkpinfo->media_device);
+        }
     }
     mr_asprintf(tmp, "%s/changed.files", MONDO_CACHE);

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

@@ -488 +488 @@
             *p = '\0';
         }
-        mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+        mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
         mr_free(bkpinfo->isodir);
         bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp1,TRUE);
@@ -776 +776 @@
 
     if (flag_set['S']) {
+        /* Before changing remove old ones if any */
+        if (bkpinfo->scratchdir) {
+            chdir("/tmp");
+            mr_asprintf(tmp1, "rm -Rf %s", bkpinfo->scratchdir);
+            paranoid_system(tmp1);
+            mr_free(tmp1);
+        }
         mr_asprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
     }

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

@@ -94 +94 @@
 {
 //  log_it("rctada: Retracting all CD trays", __LINE__);
-    if (strlen(g_cdrom_drive_is_here) > 0) {
-        inject_device(g_cdrom_drive_is_here);
-    }
-    if (strlen(g_dvd_drive_is_here) > 0) {
-        inject_device(g_dvd_drive_is_here);
-    }
-    if (strlen(g_cdrw_drive_is_here) > 0) {
-        inject_device(g_cdrw_drive_is_here);
+    if (!bkpinfo->please_dont_eject) {
+        if (strlen(g_cdrom_drive_is_here) > 0) {
+            inject_device(g_cdrom_drive_is_here);
+        }
+        if (strlen(g_dvd_drive_is_here) > 0) {
+            inject_device(g_dvd_drive_is_here);
+        }
+        if (strlen(g_cdrw_drive_is_here) > 0) {
+            inject_device(g_cdrw_drive_is_here);
+        }
     }
 //  log_it("rctada: killing autorun");
@@ -537 +539 @@
     tmp1 = find_home_of_exe(cdr_exe);
     if (tmp1) {
-        mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1", cdr_exe);
+        mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1", cdr_exe);
         tmp = call_program_and_get_last_line_of_output(command,TRUE);
         mr_free(command);
@@ -846 +848 @@
     }
 
-    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1",TRUE);
+    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
         mr_free(tmp);
-        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1",TRUE);
+        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     if (tmp[0]) {
         devno = atoi(tmp) - 1;
@@ -1448 +1450 @@
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
         log_msg(3, "Currently, we hold %d but we want %d", res, cd_number_i_want);
+
+        /* Now we need to umount the current media to have the next mounted after */
+        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
+        log_msg(3, "Mounting next media %d",cd_number_i_want);
+        g_current_media_number = cd_number_i_want;
+        mount_media();
+
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         log_msg(3, "Insisting on %s #%d", mds, cd_number_i_want);
@@ -1457 +1466 @@
             if (is_this_device_mounted(MNT_CDROM)) {
                 res =
-                    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+                    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
             } else {
                 res = 0;
@@ -1995 +2004 @@
 char *tmp = NULL;
 char *tmp1 = NULL;
+char *tmp2 = NULL;
 
 if (pathlist == NULL) {
@@ -2052 +2062 @@
         /*  Adds a | to ensure correct detection even at both ends */
         mr_asprintf(tmp1,"|%s",token);
+        mr_asprintf(&tmp2,"|%s|",token);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
             mr_asprintf(tmp,"|%s|",bkpinfo->exclude_paths);
-            if (strstr(tmp,tmp1) == NULL) {
+            if (strstr(tmp,tmp2) == NULL) {
                 if (bkpinfo->exclude_paths) {
                     mr_strcat(bkpinfo->exclude_paths,tmp1);
@@ -2066 +2077 @@
             /*  Add the token if not already in the list */
             mr_asprintf(tmp,"|%s|",bkpinfo->include_paths);
-            if (strstr(tmp,tmp1) == NULL) {
+            if (strstr(tmp,tmp2) == NULL) {
                 mr_strcat(bkpinfo->include_paths, "%s", tmp1);
             }
@@ -2072 +2083 @@
         }
         mr_free(tmp);
+        mr_free(tmp2);
         break;
     }

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

@@ -1366 +1366 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
@@ -1582 +1582 @@
         mr_free(tmp1);
 
-        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/dev/shm|"MINDI_CACHE, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
+        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
         if (excp != NULL) {
             mr_strcat(exclude_paths,"|%s",excp);

branches/3.1/mondo/src/common/libmondo-files-EXT.h

@@ -45 +45 @@
 extern long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);
 
-extern int make_grub_install_scriptlet(char *outfile);
 extern int read_one_liner_data_file(char *fname, char *contents);

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

@@ -904 +904 @@
     if (res) {
         log_to_screen("Please install '%s'. I cannot find it on your system.", fname);
-        log_to_screen("There may be hyperlink at http://www.mondorescue.com which");
+        log_to_screen("There may be hyperlink at http://www.mondorescue.org which");
         log_to_screen("will take you to the relevant (missing) package.");
         return (1);
@@ -1063 +1063 @@
     /*@ buffers ******** */
     char *netfs_dev = NULL;
-    char *mac_addr = NULL;
+    char *netfs_client_hwaddr = NULL;
     char *netfs_mount = NULL;
     char *netfs_client_ipaddr = NULL;
@@ -1127 +1127 @@
     if (!strncmp(netfs_dev, "bond", 4) || !strncmp(netfs_dev, "alb", 3) || !strncmp(netfs_dev, "aft", 3)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
-        mr_asprintf(command, "%s", "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
-        mac_addr = call_program_and_get_last_line_of_output(command,TRUE);
+
+        mr_asprintf(command, "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
+        netfs_client_hwaddr = call_program_and_get_last_line_of_output(command,TRUE);
         mr_free(command);
 
-        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,netfs_dev);
-        mr_free(mac_addr);
+        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", netfs_client_hwaddr, netfs_dev);
         mr_free(netfs_dev);
 
@@ -1151 +1151 @@
     mr_free(netfs_mount);
 
-    mr_asprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
-    mr_free(tmp);
-
     mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_hwaddr);
     mr_free(tmp);
 
@@ -1306 +1306 @@
 }
 
-
-/**
- * Create a small script that mounts /boot, calls @c grub-install, and syncs the disks.
- * @param outfile Where to put the script.
- * @return 0 for success, 1 for failure.
- */
-int make_grub_install_scriptlet(char *outfile)
-{
-    FILE *fout;
-    char *tmp = NULL;
-    int retval = 0;
-
-    if ((fout = fopen(outfile, "w"))) {
-        fprintf(fout,
-                "#!/bin/sh\n\nmount /boot > /dev/null 2> /dev/null\ngrub-install $@\nres=$?\nsync;sync;sync\nexit $res\n");
-        paranoid_fclose(fout);
-        log_msg(2, "Created %s", outfile);
-        mr_asprintf(tmp, "chmod +x %s", outfile);
-        paranoid_system(tmp);
-        mr_free(tmp);
-        retval = 0;
-    } else {
-        retval = 1;
-    }
-    return (retval);
-}
-
 /* @} - end fileGroup */

branches/3.1/mondo/src/common/libmondo-files.h

@@ -44 +44 @@
 int make_hole_for_dir(const char *outdir_fname);
 long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);
-int make_grub_install_scriptlet(char *outfile);
-
 int read_one_liner_data_file(char *fname, char *contents);

branches/3.1/mondo/src/common/libmondo-fork.c

@@ -97 +97 @@
  * - @c bkpinfo->manual_cd_tray
  * - @c bkpinfo->backup_media_type
- * - @c bkpinfo->please_dont_eject_when_restoring
  * @param basic_call The call to mkisofs. May contain tokens that will be resolved to actual data. The tokens are:
  * - @c _ISO_ will become the ISO file (@p isofile)

branches/3.1/mondo/src/common/libmondo-mountlist.c

@@ -840 +840 @@
             !strcmp(mountlist->el[items].device, "/sys") ||
             !strcmp(mountlist->el[items].device, "sys") ||
+            !strcmp(mountlist->el[items].device, "/run") ||
+            !strcmp(mountlist->el[items].device, "run") ||
             !strcmp(mountlist->el[items].device, "/devpts") ||
             !strcmp(mountlist->el[items].device, "devpts")

branches/3.1/mondo/src/common/libmondo-raid.c

@@ -1022 +1022 @@
     // get RAID level
     token = mr_strtok(string, delims, &lastpos);
+    // skip potential auto-read-only entry
+    if (!strcmp(token, "(auto-read-only)")) {
+        mr_free(token);
+        token = mr_strtok (string, delims, &lastpos);
+    }
     if (!strcmp(token, "multipath")) {
       raidlist->el[raidlist->entries].raid_level = -2;

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

@@ -737 +737 @@
 
     set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+
+    /* restore compression mode on */
+    mr_asprintf(&command, "mt -f %s compression on",bkpinfo->media_device);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
     return(res);
 }

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

@@ -378 +378 @@
     log_msg(1, "Post-param");
     if (bkpinfo->backup_media_type == tape) {
+        if (whine_if_not_found("mt") == 1) {
+            fatal_error("Please install the mt command");
+        }
         log_msg(1, "Tape");
         if (bkpinfo->media_device == NULL) {
@@ -718 +721 @@
         /* purging a potential old tmpdir */
         log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
+        chdir("/tmp");
         mr_asprintf(tmp,"rm -Rf %s",bkpinfo->tmpdir);
         mr_free(bkpinfo->tmpdir);

branches/3.1/mondo/src/common/libmondo-verify.c

@@ -987 +987 @@
     verify_all_slices_on_CD(mountpoint);
 
-    mr_asprintf(tmp1, "umount %s", mountpoint);
+    mr_asprintf(tmp1, "umount -d %s", mountpoint);
 #ifdef __FreeBSD__
     ret += system(tmp1);
@@ -1118 +1118 @@
 #ifdef __FreeBSD__
     ret = 0;
-    mr_asprintf(command, "umount %s", mountpoint);
+    mr_asprintf(command, "umount -d %s", mountpoint);
     ret += system(command);
     ret += kick_vn(mddevice);
     if (ret) {
 #else
-    mr_asprintf(command, "umount %s", mountpoint);
+    mr_asprintf(command, "umount -d %s", mountpoint);
     if (system(command)) {
 #endif
@@ -1136 +1136 @@
 
     if (!does_file_exist(fname)) {
-        mr_asprintf(command, "umount %s", bkpinfo->media_device);
+        mr_asprintf(command, "umount -d %s", bkpinfo->media_device);
         run_program_and_log_output(command, 2);
         mr_free(command);

branches/3.1/mondo/src/common/newt-specific.c

@@ -262 +262 @@
 char *tmp1 = NULL;
 
-    mr_asprintf(tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
+    mr_asprintf(tmp,"ps %s | grep \" %s \" | grep -v \"grep\" | awk '{print %s;}'", ps_options, str , ps_proc_id);
     run_program_and_log_output(tmp, TRUE);
     if (strlen(tmp) > 0) {
@@ -320 +320 @@
         chdir("/");
         if (g_selfmounted_isodir) {
-            mr_asprintf(command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
             mr_free(command);
@@ -368 +368 @@
         char *command = NULL;
 
-        chdir("/");
-        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        /*  Before removing dir, make sure we're out of them */
+        chdir("/tmp");
+        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            mr_asprintf(command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             mr_free(command);
@@ -382 +383 @@
             log_msg(8,"tempdir is %s",bkpinfo->tmpdir);
             if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
-                log_msg(8,"erasing tempdir");
+                log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir);
                 mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir);
                 system(command);
@@ -391 +392 @@
             log_msg(8,"scratchdir is %s", bkpinfo->scratchdir);
             if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
-                log_msg(8,"erasing scratchdir");
+                log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir);
                 mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
                 system(command);
@@ -579 +580 @@
             newtCenteredWindow(40, 7, title);
             g_isoform_main = newtForm(NULL, NULL, 0);
-            g_isoform_timeline = newtLabel(1, 5, "This is the timeline");
-            g_isoform_pcline = newtLabel(1, 6, "This is the pcline");
+            g_isoform_timeline = newtLabel(1, 5, "                    ");
+            g_isoform_pcline = newtLabel(1, 6, "                  ");
             newtFormAddComponents(g_isoform_main, g_isoform_timeline,
                                   g_isoform_pcline, g_isoform_header,
                                   g_isoform_scale, NULL);
+            newtDrawForm(g_isoform_main);
             newtRefresh();
         }
@@ -647 +649 @@
             g_scale = newtScale(3, 6, 54, (long long)g_maximum_progress);
             g_progressForm = newtForm(NULL, NULL, 0);
-            g_percentline = newtLabel(10, 9, "This is the percentline");
-            g_timeline = newtLabel(10, 8, "This is the timeline");
+            g_percentline = newtLabel(10, 9, "                       ");
+            g_timeline = newtLabel(10, 8, "                    ");
             newtFormAddComponents(g_progressForm, g_percentline, g_timeline, g_scale, g_blurb1, g_blurb3, g_blurb2, NULL);
             newtPushHelpLine(b1c);
+            newtDrawForm(g_progressForm);
             newtRefresh();
         }
@@ -969 +972 @@
         }
         if (!g_text_mode) {
+            newtDrawForm(g_isoform_main);
             newtRefresh();
         }
@@ -1100 +1104 @@
             mr_free(percentline_str);
 
+            newtDrawForm(g_progressForm);
             newtRefresh();
         }

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

@@ -10 +10 @@
 #include "mondoprep.h"
 #include "../common/libmondo.h"
+#include "../common/libmondo-tools-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
 #include <sys/ioctl.h>
@@ -43 +44 @@
 
 FILE *g_fprep = NULL;
-
-
+extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
 
 int g_partition_table_locked_up = 0;
-
-
-
-
-
-
-
 
 
@@ -323 +316 @@
         res = run_program_and_log_output(command, 5);
         if (res > 0 && (p = strstr(command, "lvm "))) {
+            log_msg(0, "%s --> %d failed so removing lvm just in case", command, res);
             *p = *(p + 1) = *(p + 2) = ' ';
             res = run_program_and_log_output(command, 5);
@@ -545 +539 @@
   char *level   = NULL;
   char *program = NULL;
+  char *tmp = NULL;
+  char *oldmd = NULL;
+  char *bootdevice;
+  char *name;
+
+  malloc_string(bootdevice);
+  malloc_string(name);
   
   // leave straight away if raidlist is initial or has no entries
@@ -589 +590 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  mr_asprintf(program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
+  // As per bug #473, the parameter "-e 0.90" is used only when:
+  //   1) It detects that system boots from Raid-1
+  //   2) grub bootloader < v1 is used.
+  // Otherwise it won't boot which is bad.
+    read_cfg_var(g_mondo_cfg_file, "bootloader.device", bootdevice);
+    read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
+    if (strcmp(name,"GRUB") == 0) {
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("grub --version"));
+        if ((strstr(tmp, "GRUB 0.9") != NULL) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
+            mr_free(oldmd);
+            mr_asprintf(oldmd, "-e 0.90");
+            log_it("Forcing old metadata 0.90 for md on %s for old GRUB", device);
+        }
+    } else if ((strcmp(name,"LILO") == 0) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
+        mr_free(oldmd);
+        mr_asprintf(oldmd, "-e 0.90");
+        log_it("Forcing old metadata 0.90 for md on %s for LILO", device);
+    } else {
+        mr_asprintf(oldmd, "");
+    }
+    mr_free(device);
+    mr_free(name);
+
+  mr_asprintf(program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d %s", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries, oldmd);
+  mr_free(oldmd);
   if (raidlist->el[i].parity != -1) {
     mr_asprintf(strtmp, "%s", program);
@@ -2289 +2314 @@
 
     /** float ***********************************************************/
-    long long factor;
+    float factor;
     long long new_size;
 
@@ -2322 +2347 @@
 
     drivemntlist = malloc(sizeof(struct mountlist_reference));
-    drivemntlist->el =
-        malloc(sizeof(struct mountlist_line *) * MAX_MOUNTLIST_ENTRIES);
+    drivemntlist->el = malloc(sizeof(struct mountlist_line *) * MAX_MOUNTLIST_ENTRIES);
 
     if (!drivemntlist) {
@@ -2337 +2361 @@
     }
 
-    if (original_size_of_drive <= 0) {
+    if (original_size_of_drive <= 0LL) {
         log_to_screen("Cannot resize %s's entries. Drive not found.", drive_name);
         return;
     }
-    factor = (current_size_of_drive) / (original_size_of_drive);
-    log_to_screen("Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %lld)", drive_name, original_size_of_drive/1024, current_size_of_drive/1024, factor);
+    factor = ((float)current_size_of_drive/(float)original_size_of_drive);
+    mr_asprintf(tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %.5f)",
+            drive_name, original_size_of_drive/1024, current_size_of_drive/1024, factor);
+    log_to_screen(tmp);
+    mr_free(tmp);
 
     lastpart = drivemntlist->entries - 1;
@@ -2348 +2375 @@
         /* the 'atoi' thing is to make sure we don't try to resize _images_, whose formats will be numeric */
         if (!atoi(drivemntlist->el[partno]->format)) {
-            new_size = (drivemntlist->el[partno]->size) * factor;
+            new_size = (long long)((drivemntlist->el[partno]->size) * factor);
         } else {
             new_size = drivemntlist->el[partno]->size;

branches/3.1/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1804 +1804 @@
 #undef ACOMP
 
+        newtDrawForm(editraidForm);
         newtRefresh();
         b_res = newtRunForm(editraidForm);

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

@@ -205 +205 @@
     return (1);
 }
-paranoid_system("umount "MNT_CDROM" 2> /dev/null"); /* just in case */
+paranoid_system("umount -d " MNT_CDROM " 2> /dev/null");    /* just in case */
 
 if (is_this_device_mounted(g_isodir_device)) {
@@ -612 +612 @@
         }
     }
-    run_program_and_log_output("umount "MNT_CDROM, FALSE);
+    run_program_and_log_output("umount -d "MNT_CDROM, FALSE);
     if (!does_file_exist(cfg_file)) {
         log_it("%s",cfg_file);
@@ -684 +684 @@
             if (does_file_exist(MNT_CDROM"/archives/filelist.0")) {
                 bkpinfo->backup_media_type = cdr;
-                run_program_and_log_output("umount "MNT_CDROM, 1);
+                run_program_and_log_output("umount -d "MNT_CDROM, 1);
                 log_it
                     ("Re-jigging configuration AGAIN. CD-R, not ISO.");
@@ -1414 +1414 @@
             if (res) {
                 popup_and_OK
-                    ("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
-                newtSuspend();
-                system("chroot " MNT_RESTORING);
-                newtResume();
-                popup_and_OK("Thank you.");
+                    ("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+                sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                sprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                }
+                paranoid_system(tmp);
+                sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                if (!g_text_mode) {
+                    newtResume();
+                }
+                sprintf(command, "stabgrub-me %s", boot_device);
+                res = run_program_and_log_output(command, 1);
+                if (res) {
+                    popup_and_OK
+                        ("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
+                    newtSuspend();
+                    system("chroot " MNT_RESTORING);
+                    newtResume();
+                    popup_and_OK("Thank you.");
+                } else {
+                    popup_and_OK("GRUB is now installed correctly");
+                    done = TRUE;
+                }
             } else {
                 done = TRUE;
@@ -1933 +1960 @@
 
     /* Unmounting the local /proc and /sys first */
-    run_program_and_log_output("umount " MNT_RESTORING "/proc",3);
-    run_program_and_log_output("umount " MNT_RESTORING "/sys",3);
+    run_program_and_log_output("umount -d " MNT_RESTORING "/proc",3);
+    run_program_and_log_output("umount -d " MNT_RESTORING "/sys",3);
 
     for (lino = mountlist->entries - 1; lino >= 0; lino--) {
@@ -1948 +1975 @@
             } else {
                 if (!strcmp(mountlist->el[lino].mountpoint, "/1")) {
-                    mr_asprintf(command, "umount %s/", MNT_RESTORING);
+                    mr_asprintf(command, "umount -d %s/", MNT_RESTORING);
                     log_msg(3,
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
-                    mr_asprintf(command, "umount " MNT_RESTORING "%s", mountlist->el[lino].mountpoint);
+                    mr_asprintf(command, "umount -d " MNT_RESTORING "%s", mountlist->el[lino].mountpoint);
 
                     /* To support latest Ubuntu where /var is a separate FS 
@@ -1998 +2025 @@
  *END_UNMOUNT_ALL_DEVICES                                                 *
  **************************************************************************/
-
-
 
 /**************************************************************************

branches/3.1/mondo/src/mondorestore/mondorestore.c

@@ -116 +116 @@
 
 /**************************************************************************
- * COMPAQ PROLIANT Stuff:  needs some special help                        *
+ * COMPAQ ProLiant Stuff:  needs some special help                        *
 **************************************************************************/
 
 /**
- * The message to display if we detect that the user is using a Compaq Proliant.
+ * The message to display if we detect that the user is using a Compaq ProLiant.
  */
 #define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo media in Interactive Mode."
@@ -209 +209 @@
  * @ingroup restoreUtilityGroup
  */
-void offer_to_abort_because_Compaq_Proliants_suck(void)
+void offer_to_abort_because_Compaq_ProLiants_suck(void)
 {
     popup_and_OK(COMPAQ_PROLIANTS_SUCK);
@@ -256 +256 @@
         popup_and_OK("No restoring or comparing will take place today.");
         if (is_this_device_mounted("/mnt/cdrom")) {
-            run_program_and_log_output("umount /mnt/cdrom", FALSE);
+            run_program_and_log_output("umount -d /mnt/cdrom", FALSE);
         }
         if (g_ISO_restore_mode) {
-            mr_asprintf(tmp, "umount %s", bkpinfo->isodir);
+            mr_asprintf(tmp, "umount -d %s", bkpinfo->isodir);
             run_program_and_log_output(tmp, FALSE);
             mr_free(tmp);
@@ -485 +485 @@
                 if (partition_table_contains_Compaq_diagnostic_partition
                     (mountlist)) {
-                    offer_to_abort_because_Compaq_Proliants_suck();
+                    offer_to_abort_because_Compaq_ProLiants_suck();
                     done = TRUE;
                 } else {
@@ -693 +693 @@
     }
     if (is_this_device_mounted(MNT_CDROM)) {
-        paranoid_system("umount " MNT_CDROM);
+        paranoid_system("umount -d " MNT_CDROM);
     }
 //  if (! already_mounted)
 //    {
-    if (system("umount /tmp/isodir 2> /dev/null")) {
+    if (system("umount -d /tmp/isodir 2> /dev/null")) {
         log_to_screen
             ("WARNING - unable to unmount device where the ISO files are stored.");
@@ -773 +773 @@
         if (partition_table_contains_Compaq_diagnostic_partition
             (mountlist)) {
-            offer_to_abort_because_Compaq_Proliants_suck();
+            offer_to_abort_because_Compaq_ProLiants_suck();
         } else {
             twenty_seconds_til_yikes();
@@ -949 +949 @@
                 "Tape : I don't need to unmount or eject the CD-ROM.");
     } else {
-        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (!bkpinfo->please_dont_eject) {
             eject_device(bkpinfo->media_device);
         }
     }
-    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
     if (!bkpinfo->please_dont_eject) {
         eject_device(bkpinfo->media_device);
@@ -2138 +2138 @@
 
         /* Now we need to umount the current media to have the next mounted by insist_on_this_cd_number */
-        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        /*   run_program_and_log_output("umount " MNT_CDROM, FALSE); */
     }
     mr_free(mds);
@@ -2635 +2635 @@
     make_hole_for_dir("/var/log");
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
-    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
 
     run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
@@ -2669 +2669 @@
         fout = fopen("/tmp/out.txt", "w");
         fput_string_one_char_at_a_time(stderr, argv[2]);
-        finish(0);
-    }
-
-    if (argc == 3 && strcmp(argv[1], "--gendf") == 0) {
-        make_grub_install_scriptlet(argv[2]);
         finish(0);
     }
@@ -2892 +2887 @@
             sync();
             if (is_this_device_mounted(MNT_CDROM)) {
-                run_program_and_log_output("umount " MNT_CDROM, FALSE);
+                run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
             }
 
@@ -2950 +2945 @@
     log_to_screen("Mondo-restore is exiting (retval=%d)                                      ", retval);
 
-    mr_asprintf(tmp, "umount %s", bkpinfo->isodir);
+    mr_asprintf(tmp, "umount -d %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
     mr_free(tmp);

branches/3.1/mondo/src/post-nuke.sample/usr/bin/Makefile.am

@@ -1 +1 @@
 postnukeusrbindir      = $(pkgdatadir)/post-nuke.sample/usr/bin
-postnukeusrbin_SCRIPTS = post-nuke
+postnukeusrbin_SCRIPTS = post-nuke post-nuke.debian

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

@@ -29 +29 @@
     fi
     if [ -e "$MNT_RESTORING/boot/grub/stage1" ] ; then
-        echo "Alright then."
+        echo "All right then."
         return
     fi
@@ -136 +136 @@
 FindBootPart $1 $2 2>&1 | tee -a $LOGFILE
 mbrdev=`echo $1 | sed 's/\([^0-9]*\)[0-9]*$/\1/'`
-if echo $bootpart | grep "/cciss/" > /dev/null ; then
-    partno=`basename $bootpart | cut -d'p' -f2`
+if echo $mbrdev | grep "/cciss/" > /dev/null ; then
+    partno=`basename $mbrdev | cut -d'p' -f2`
     mbrdev=`echo $mbrdev | cut -d'p' -f1`
-elif echo $bootpart | grep "/mapper/mpath" > /dev/null ; then
-    partno=`basename $bootpart | cut -d'p' -f3`
-    mbrdev=`echo $mbrdev | cut -d'p' -f1`
-else
-    partno=`basename $bootpart | sed 's/[a-z]*//'`
+elif echo $mbrdev | grep "/mapper/mpath" > /dev/null ; then
+    partno=`basename $mbrdev | cut -d'p' -f3`
+    mbrdev=`echo $mbrdev | cut -d'p' -f1-4`
+else
+    partno=`basename $mbrdev | sed 's/[a-z]*//'`
 fi
 if [ ! "$partno" ] ; then
@@ -150 +150 @@
     partno=$(($partno-1))
 fi
-if echo $bootpart | grep "/md" > /dev/null ; then
+if echo $mbrdev | grep "/md" > /dev/null ; then
     # FIXME: Why this if not used later
     base=`basename $bootpart`

branches/3.1/website/downloads.shtml

@@ -31 +31 @@
                     <a href="http://www.mondorescue.org">Web site</a>, 
                     <a href="ftp://ftp.mondorescue.org">Ftp site (ftp)</a>
+                    <a href="http://www.mondorescue.org/ftp">Ftp site (http)</a>
                     <a href="rsync://rsync.mondorescue.org::mondorescue-ftp">Ftp site (rsync)</a>
                     <ul>
@@ -38 +39 @@
                 </li>
             </ul>
-            <li><i>Germany</i>:</li>
-            <ul>
-                <li>Linjection.org:
-                    <a href="http://mondorescue.linjection.org">Web site</a>, 
-                    <a href="http://mondorescue.linjection.org/ftp">Ftp site (http)</a>
-                </li>
-            </ul>
             <li><i>Italy</i>:</li>
             <ul>
-                    <li>Daniele Carbonetti (<a href="http://www.dcl-arch.it">http://www.dcl-arch.it</a>):
-                    <a href="http://mondorescue.dcl-arch.it">Web site</a>, 
-                    <a href="http://www.dcl-arch.it/pub/mondorescue">Ftp site (http)</a>
-                    <a href="ftp://ftp.dcl-arch.it/pub/mondorescue">Ftp site (ftp)</a>
-                    <a href="rsync://rsync.dcl-arch.it::mondorescue">Ftp site (rsync)</a>
+                    <li>Dimitri Bellini (<a href="http://www.quadrata.it/">http://www.quadrata.it/</a>):
+                    <a href="http://mondo.quadrata.it">Web site</a>, 
+                    <a href="ftp://mondo.quadrata.it/">Ftp site (ftp)</a>
+                    <a href="http://mondo.quadrata.it/ftp">Ftp site (http)</a>
                     <ul>
-                            <li>Update times: 2 times/day</li>
-                            <li>Internet Bandwith: 100Mbit</li>
-                            <li><i>doesn't seem to be active anymore</i></li>
+                            <li>Update times: 1 time/day</li>
+                            <li>Internet Bandwith: Mbit</li>
                     </ul>
                 </li>
@@ -78 +70 @@
     </div>
     <p><A NAME="dependencies"></A>
-<p>The solution has been written in C/bash/perl and developed on a <a href="http://www.mandriva.com/">Mandriva</a> <a href="http://www.gnu.org/">Gnu</a>/<a href="http://www.lwn.net/">Linux</a> distribution. For it to work, you will need:</p>
+<p>The solution is being written in C/bash/perl and developed on a <a href="http://www.maegia.cg">Mageia</a> <a href="http://www.gnu.org/">Gnu</a>/<a href="http://www.lwn.net/">Linux</a> distribution. For it to work, you will need:</p>
 <ul>
 <li><b><a href="">afio</a></b>: the packaging tool used to create the archive packets</li>
@@ -88 +80 @@
 </ul>
 
-<p>For Mandriva/Mandrake distributions, just use the magic:<br>
-<tt>urpmi mondo</tt></p>
+<p>For Mageia/Mandriva/Mandrake distributions, just use the magic:<br>
+<tt>urpmi mondo</tt>
 to use the native packages of your distribution, or download the <a href="ftp://ftp.mondorescue.org/mandriva/">repo file</a> mondorescue.addmedia script and launch it if you want to use upstream packages.
-<p>
-<p>For Fedora distributions, after downloading the <a href="ftp://ftp.mondorescue.org/fedora/">repo file</a> mondorescue.repoand adding it to the /etc/yum.repos.d directory, just use the magic:<br>
-<tt>yum install mondo</tt></p>
-<p>
+</p><p>
+<p>For Fedora distributions, after downloading the <a href="ftp://ftp.mondorescue.org/fedora/">repo file</a> mondorescue.repo and adding it to the /etc/yum.repos.d directory, just use the magic:<br>
+<tt>yum install mondo</tt>
+</p><p>
 For Debian/Ubuntu, just use the magic: <br>
-<tt>apt-get install mondo</tt></p>
+<tt>apt-get install mondo</tt>
 to use the native packages of your distribution, or download the <a href="ftp://ftp.mondorescue.org/debian/">repo file</a> mondorescue.sources.list and add it to your /etc/apt/sources.list.d directory if you want to use upstream packages.
-<p>
+</p><p>
 For the other RPM based distributions, you will have to issue a <br>
 <tt>rpm -ivh *.rpm</tt><br>
@@ -122 +114 @@
         <li>RedHat <a href="ftp://ftp.mondorescue.org/redhat/7.3">7.3</a>, <a href="ftp://ftp.mondorescue.org/redhat/9">9</a>.</li>
         <li>Fedora <a href="ftp://ftp.mondorescue.org/fedora/4">Core 4</a>, <a href="ftp://ftp.mondorescue.org/fedora/5">Core 5</a>, <a href="ftp://ftp.mondorescue.org/fedora/6">Core 6</a>, <a href="ftp://ftp.mondorescue.org/fedora/7">7</a>, <a href="ftp://ftp.mondorescue.org/fedora/8">8</a>, <a href="ftp://ftp.mondorescue.org/fedora/9">9</a>, <a href="ftp://ftp.mondorescue.org/fedora/10">10</a>, <a href="ftp://ftp.mondorescue.org/fedora/11">11</a>, <a href="ftp://ftp.mondorescue.org/fedora/12">12</a>, <a href="ftp://ftp.mondorescue.org/fedora/13">13</a>, <a href="ftp://ftp.mondorescue.org/fedora/14">14</a>, <a href="ftp://ftp.mondorescue.org/fedora/15">15</a>.</li>
-        <li>RedHat Enterprise Linux <a href="ftp://ftp.mondorescue.org/rhel/2.1">2.1</a>, <a href="ftp://ftp.mondorescue.org/rhel/3">3</a>, <a href="ftp://ftp.mondorescue.org/rhel/4">4</a>, <a href="ftp://ftp.mondorescue.org/rhel/5">5</a>, <a href="ftp://ftp.mondorescue.org/rhel/6">6</a>.</li>
+        <li>RedHat Enterprise Linux <a href="ftp://ftp.mondorescue.org/rhel/2.1">2.1</a>, <a href="ftp://ftp.mondorescue.org/rhel/3">3</a>, <a href="ftp://ftp.mondorescue.org/rhel/4">4</a>, <a href="ftp://ftp.mondorescue.org/rhel/5">5</a>, <a href="ftp://ftp.mondorescue.org/rhel/6">6</a>.</li> (The same packages can be used for other RHEL clones such as CentOS, OEL, Scientific Linux, ...)
+        <li>Mageia <a href="ftp://ftp.mondorescue.org/mageia/1">1</a>.</li>
         <li>Mandriva <a href="ftp://ftp.mondorescue.org/mandrake/10.1">10.1</a>, <a href="ftp://ftp.mondorescue.org/mandrake/10.2">10.2</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2006.0">2006.0</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2007.0">2007.0</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2007.1">2007.1</a>., <a href="ftp://ftp.mondorescue.org/mandriva/2008.0">2008.0</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2008.1">2008.1</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2009.0">2009.0</a>,  <a href="ftp://ftp.mondorescue.org/mandriva/2009.1">2009.1</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2010.0">2010.0</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2010.1">2010.1</a>.</li>
-        <li>Mageia <a href="ftp://ftp.mondorescue.org/mageia/1">1</a>.</li>
         <li>OpenSuSE <a href="ftp://ftp.mondorescue.org/suse/10.0">10.0</a>, <a href="ftp://ftp.mondorescue.org/suse/10.1">10.1</a>, <a href="ftp://ftp.mondorescue.org/suse/10.2">10.2</a>, <a href="ftp://ftp.mondorescue.org/suse/10.3">10.3</a>, <a href="ftp://ftp.mondorescue.org/opensuse/11.0">11.0</a>, <a href="ftp://ftp.mondorescue.org/opensuse/11.1">11.1</a>, <a href="ftp://ftp.mondorescue.org/opensuse/11.2">11.2</a>, <a href="ftp://ftp.mondorescue.org/opensuse/11.3">11.3</a>, <a href="ftp://ftp.mondorescue.org/opensuse/11.4">11.4</a>. Look also at <a href="http://www.mikenjane.net/~mike/">this</a> web page for SuSE details. <a href="http://packman.links2linux.org/">Packman</a> may have some useful additional packages.
         <li>SuSE Linux Enterprise Server <a href="ftp://ftp.mondorescue.org/sles/9">9</a>, <a href="ftp://ftp.mondorescue.org/sles/10">10</a>, <a href="ftp://ftp.mondorescue.org/sles/11">11</a>.</li>

branches/3.1/website/mondorescue.org.conf

@@ -5 +5 @@
     ServerAlias mondorescue.org
     ServerAdmin webmaster@mondorescue.org
-    DocumentRoot /mondo/www/html/mondo
+    DocumentRoot /prj/www/html/mondorescue
     CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
     Errorlog /var/log/httpd/www.mondorescue.org/error_log
@@ -11 +11 @@
     RewriteRule     ^/index\.html$  /index.shtml
     RewriteRule     ^/$  /index.shtml
-    SetEnv TRAC_ENV "/mondo/trac/mondorescue.env"
 
-    <Directory "/mondo/www/html/mondo">
+    <Directory "/prj/www/html/mondorescue">
     DirectoryIndex index.shtml
         Options -Indexes MultiViews FollowSymLinks +Includes
@@ -21 +20 @@
     </Directory>
 
-    <Directory "/mondo/www/cgi-bin">
+    <Directory "/prj/www/html/mondorescue/ftp">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+    </Directory>
+
+    <Directory "/var/www/cgi-bin">
         AllowOverride All
         Options ExecCGI FollowSymLinks
@@ -28 +34 @@
     </Directory>
 
-    ScriptAlias /cgi-bin/ "/mondo/www/cgi-bin/"
-
 </VirtualHost>
 
 <VirtualHost 10.3.252.23>
     ServerName trac.mondorescue.org
-    SetEnv TRAC_ENV "/mondo/trac/mondorescue.env"
-    DocumentRoot /mondo/www/cgi-bin/trac.cgi
+    DocumentRoot /prj/www/html/mondorescue
     ServerAdmin webmaster@mondorescue.org
     CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
     Errorlog /var/log/httpd/www.mondorescue.org/error_log
 
-    # fix mdk bug #16298
-    PassEnv LC_ALL
-    PassEnv LANG
-
-    <Directory "/mondo/www/cgi-bin">
+    <Directory "/var/www/cgi-bin">
         AllowOverride All
         Options ExecCGI FollowSymLinks
@@ -51 +50 @@
     </Directory>
 
-    Alias /trac/ "/usr/share/trac/htdocs/"
-    ScriptAlias /cgi-bin/ "/mondo/www/cgi-bin/"
+    <Location "/">
+        SetEnv TRAC_ENV "/prj/trac/mondorescue.env"
+    </Location>
 
-    # You need something like this to authenticate users
-    #<Location "/login">
-        #AuthType Basic
-        #AuthName "MondoRescue"
-        #AuthUserFile /usr/local/etc/trac.htpasswd
-        #Require valid-user
-    #</Location>
+    ScriptAlias / "/var/www/cgi-bin/trac.fcgi/"
 </VirtualHost>
 
@@ -66 +60 @@
     ServerName oldwww.mondorescue.org
     ServerAdmin webmaster@mondorescue.org
-    DocumentRoot /mondo/www/html/oldwww
+    DocumentRoot /prj/www/html/oldmondorescue
     CustomLog /var/log/httpd/oldwww.mondorescue.org/access_log combined
     Errorlog /var/log/httpd/oldwww.mondorescue.org/error_log
-    <Directory "/mondo/www/html/oldwww">
+    <Directory "/prj/www/html/oldmondorescue">
         Options -Indexes MultiViews FollowSymLinks +Includes
         AllowOverride None
@@ -80 +74 @@
     ServerName www1.mondorescue.org
     ServerAdmin webmaster@mondorescue.org
-    DocumentRoot /mondo/www/html/test
+    DocumentRoot /prj/www/html/testmondorescue
     CustomLog /var/log/httpd/www1.mondorescue.org/access_log combined
     Errorlog /var/log/httpd/www1.mondorescue.org/error_log
-    <Directory "/mondo/www/html/test">
+    <Directory "/prj/www/html/testmondorescue">
         Options -Indexes MultiViews FollowSymLinks +Includes
         AllowOverride None
@@ -94 +88 @@
     ServerName mondo.hpintelco.org
     ServerAdmin webmaster@mondorescue.org
-    DocumentRoot /var/www/html
+    DocumentRoot /prj/www/html/mondorescue
     CustomLog /var/log/httpd/mondo.hpintelco.org/access_log combined
     Errorlog /var/log/httpd/mondo.hpintelco.org/error_log
-    <Directory "/var/www/html">
+    <Directory "/prj/www/html/mondorescue">
         Options Indexes MultiViews FollowSymLinks +Includes
         AllowOverride None
@@ -103 +97 @@
         Allow from all
     </Directory>
+    <Directory "/prj/www/html/mondorescue/ftp">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+    </Directory>
+
 </VirtualHost>
 
@@ -109 +110 @@
     ServerAlias mondorescue.com
     ServerAdmin webmaster@mondorescue.com
-    DocumentRoot /mondo/www/html/mondo
+    DocumentRoot /prj/www/html/mondorescue
     CustomLog /var/log/httpd/www.mondorescue.com/access_log combined
     Errorlog /var/log/httpd/www.mondorescue.com/error_log
-    <Directory "/mondo/www/html/mondo">
+    <Directory "/prj/www/html/mondorescue">
     DirectoryIndex index.shtml
         Options -Indexes MultiViews FollowSymLinks +Includes
@@ -119 +120 @@
         Allow from all
     </Directory>
+    <Directory "/prj/www/html/mondorescue/ftp">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+    </Directory>
+
 </VirtualHost>