Changeset 576 in MondoRescue

Timestamp:

May 25, 2006, 2:00:37 PM (19 years ago)

Author:

bcornec

Message:

2.08 synced with stable as of r575
VERSION files updated

Location:

branches/2.0.8

Files:

• documentation (deleted)
• mindi-kernel/VERSION (copied) (copied from branches/stable/mindi-kernel/VERSION ) (1 diff)
• mindi-kernel/distributions (copied) (copied from branches/stable/mindi-kernel/distributions )
• mindi/ChangeLog (modified) (1 diff)
• mindi/README.ia64 (modified) (1 diff)
• mindi/README.pxe (modified) (1 diff)
• mindi/aux-tools/sbin (modified) (1 prop)
• mindi/aux-tools/usr (modified) (1 prop)
• mindi/aux-tools/usr/share (modified) (1 prop)
• mindi/aux-tools/usr/share/terminfo (modified) (1 prop)
• mindi/aux-tools/usr/share/terminfo/l (modified) (1 prop)
• mindi/distributions/gentoo/mindi.ebuild (modified) (3 diffs)
• mindi/distributions/mandriva/spec.m4 (modified) (1 diff)
• mindi/distributions/redhat/spec.m4 (modified) (1 diff)
• mindi/distributions/rpm/mindi.spec (modified) (4 diffs)
• mindi/distributions/suse/spec.m4 (modified) (1 diff)
• mindi/mindi (modified) (7 diffs)
• mindi/parted2fdisk.pl (modified) (1 diff)
• mindi/rootfs/bin (modified) (1 prop)
• mindi/rootfs/dev (modified) (1 prop)
• mindi/rootfs/etc (modified) (1 prop)
• mindi/rootfs/lib (modified) (1 prop)
• mindi/rootfs/proc (modified) (1 prop)
• mindi/rootfs/root (modified) (1 prop)
• mindi/rootfs/sbin (modified) (1 prop)
• mindi/rootfs/tmp (modified) (1 prop)
• mindi/rootfs/usr (modified) (1 prop)
• mindi/rootfs/usr/X11R6 (modified) (1 prop)
• mindi/rootfs/usr/X11R6/bin (modified) (1 prop)
• mindi/rootfs/usr/X11R6/lib (modified) (1 prop)
• mindi/rootfs/usr/bin (modified) (1 prop)
• mindi/rootfs/usr/lib (modified) (1 prop)
• mindi/rootfs/usr/local (modified) (1 prop)
• mindi/rootfs/usr/local/bin (modified) (1 prop)
• mindi/rootfs/usr/local/sbin (modified) (1 prop)
• mindi/rootfs/usr/sbin (modified) (1 prop)
• mindi/rootfs/usr/share (modified) (1 prop)
• mindi/rootfs/usr/share/udhcpc (modified) (1 prop)
• mindi/rootfs/var (modified) (1 prop)
• mindi/rootfs/var/log (modified) (1 prop)
• mindi/rootfs/var/run (modified) (1 prop)
• mondo-doc (copied) (copied from branches/stable/mondo-doc )
• mondo-doc/VERSION (modified) (1 diff)
• mondo/ChangeLog (modified) (1 diff)
• mondo/configure.in (modified) (1 diff)
• mondo/distributions/gentoo/mondo.ebuild (modified) (5 diffs)
• mondo/distributions/mandriva/changelog (modified) (1 diff)
• mondo/distributions/mandriva/spec.m4 (modified) (1 diff)
• mondo/distributions/redhat/changelog (modified) (1 diff)
• mondo/distributions/redhat/spec.m4 (modified) (1 diff)
• mondo/distributions/rpm/mondo-doc.spec (deleted)
• mondo/distributions/rpm/mondo.spec (modified) (5 diffs)
• mondo/distributions/suse/changelog (copied) (copied from branches/stable/mondo/distributions/suse/changelog )
• mondo/distributions/suse/spec.m4 (modified) (1 diff)
• mondo/mondo/autorun (modified) (1 prop)
• mondo/mondo/common/libmondo-raid-EXT.h (modified) (1 diff)
• mondo/mondo/common/libmondo-raid.c (modified) (5 diffs)
• mondo/mondo/common/libmondo-raid.h (modified) (1 diff)
• mondo/mondo/common/libmondo-string-EXT.h (modified) (1 diff)
• mondo/mondo/common/libmondo-string.c (modified) (2 diffs)
• mondo/mondo/common/libmondo-string.h (modified) (1 diff)
• mondo/mondo/common/libmondo-tools.c (modified) (2 diffs)
• mondo/mondo/common/mondostructures.h (modified) (4 diffs)
• mondo/mondo/common/my-stuff.h (modified) (1 diff)
• mondo/mondo/mondorestore/mondo-prep.c (modified) (9 diffs)
• mondo/mondo/mondorestore/mondo-restore.c (modified) (5 diffs)
• mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• mondo/mondo/mondorestore/mondoprep.h (modified) (2 diffs)
• mondo/mondo/mondorestore/mr-externs.h (modified) (1 diff)
• mondo/mondo/post-nuke.sample/usr/bin/post-nuke (modified) (1 prop)
• mondo/mondo/restore-scripts/etc (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/ask-me-a-question (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/compare-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/compare-subroutine-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/edit-mountlist (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/grub-MR (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/grub-install.patched (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/hack-elilo (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/hack-fstab (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/hack-grub (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/hack-lilo (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/ide-opt (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/ide-opt-off (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/make-me-bootable (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/mount-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/mount-subroutine-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/raw-MR (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/restore-bigfiles-from-iso (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/stabelilo-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/stabgrub-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/stablilo-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/stabraw-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/unmount-me (modified) (1 prop)
• mondo/mondo/restore-scripts/mondo/unmount-subroutine-me (modified) (1 prop)
• mondo/mondo/restore-scripts/usr (modified) (1 prop)
• mondo/mondo/restore-scripts/usr.bin (modified) (1 prop)
• mondo/mondo/restore-scripts/usr/bin (modified) (1 prop)
• tools/DISTROS (copied) (copied from branches/stable/tools/DISTROS )
• tools/TAG (copied) (copied from branches/stable/tools/TAG )
• tools/build2pkg (copied) (copied from branches/stable/tools/build2pkg )
• tools/build2qemu (copied) (copied from branches/stable/tools/build2qemu )
• tools/common-env (modified) (2 diffs)
• tools/deb-env (deleted)
• tools/distro-env (copied) (copied from branches/stable/tools/distro-env )
• tools/gentoo-env (deleted)
• tools/livwww (modified) (3 diffs)
• tools/mkcd (deleted)
• tools/mkcommon (deleted)
• tools/mkdeb (deleted)
• tools/mkdeliv (modified) (1 diff)
• tools/mkgentoo (deleted)
• tools/mkqemu (modified) (1 diff)
• tools/mkrpm (deleted)
• tools/mkslack (deleted)
• tools/mkspec (deleted)
• tools/mksvnversion (deleted)
• tools/qemu-vm.txt (modified) (3 diffs)
• tools/rpm-env (deleted)
• tools/svn-env (copied) (copied from branches/stable/tools/svn-env )
• tools/svn2build (copied) (copied from branches/stable/tools/svn2build )
• website/download.shtml (modified) (1 diff)
• website/downloads.shtml (modified) (1 diff)
• website/news.shtml (modified) (2 diffs)

branches/2.0.8/mindi-kernel/VERSION

@@ -1 @@
-stable
+2.0.8

branches/2.0.8/mindi/ChangeLog

@@ -2 +2 @@
 
 MINDI CHANGES
+
+1.0.8 (2006-05-25)
+- new build process (Bruno Cornec)
+- Fix a bug when a disk less than 2.8 MB can be built, to
+  include enough modules to support SCSI cds 
+  (Bruno Cornec)
+- Fix a bug in .spec for RPM build (%attr now unused)
+  (Bruno Cornec)
+- Add support for LABEL on swap partitions 
+  (Michel Loiseleur + Julien Pinon)
+- Attempt to fix bug 6827 (addition of a script for 
+  busybox udhcpc to support pxe/dhcp restore)
+  (Bruno Cornec)
+- support of dm and LVM v2 (Andree Leidenfrost)
+- analyze-my-lvm is under $MINDI_LIB (Andree Leidenfrost)
+- Fix a bug introduced by trying to avoid an error 
+  message when modprobe.d doesn't exist
+  (Johannes Franken)
+- Fix for Bug #6975 (/net is now excluded from kernel search location)
+  (Bruno Cornec)
+- Allow 5670 MB fllopy disks for lilo as well (Bruno Cornec)
+- Add missing net modules (Klaus Ade Johnstad)
 
 1.0.7 (2006-03-10)

branches/2.0.8/mindi/README.ia64

@@ -19 +19 @@
 Note that parted2fdisk.pl supports currently only the -l and -s options as well as the commands p,n,d,w,t,a,q
 
-Please report any problem around that tool to bcornec@users.berlios.de
+Please report any problem around that tool to bruno@mondorescue.org
 Bruno.
 

branches/2.0.8/mindi/README.pxe

@@ -27 +27 @@
 During boot mondorestore will start your NFS configuration and mount mondo's content from the network rather than from a physical media. You may alter the IP configuration stored from the original machine by passing the ipconf option describing respectively the IP address, netmask, broadcast and default gateway you want to setup for the machine, separated by ':'. Or alternatively, you may specify the dhcp keyword so that a DhCP request is made to get those information. On some configurations, you may also want to increase the number of ping queries made before the NFS mount, which is of 3 by default, using the ping option and give the number you want.
 
-Please report any problem around that tool to bcornec@users.berlios.de
+Please report any problem around that tool to bruno@mondorescue.org
 
 2005-12-18 new ipconf and ping option

branches/2.0.8/mindi/distributions/gentoo/mindi.ebuild

@@ -1 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
 # $Id$
 
 DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
 HOMEPAGE="http://www.mondorescue.org"
-SRC_URI="ftp://ftp.mondorescue.org/src/${P}.tgz"
+SRC_URI="ftp://ftp.mondorescue.org/src/${PVR}.tar.gz"
 
 LICENSE="GPL-2"
@@ -14 +16 @@
 DEPEND="virtual/libc"
 RDEPEND=">=app-arch/bzip2-0.9
-        >=sys-apps/mindi-kernel-1.0-r1
         sys-libs/ncurses
         sys-devel/binutils
@@ -27 +28 @@
     export PREFIX="/usr"
     export CONFDIR="/etc"
+    export DONT_RELINK=1
     export RPMBUILDMINDI="true"
     ./install.sh

branches/2.0.8/mindi/distributions/mandriva/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', `%{name}-%{version}.tar.bz2')dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.bz2')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
-define(`DDD', `%{addreqb}, which, grep >= 2.5')dnl
+define(`DDD', `, which, grep >= 2.5')dnl
 dnl GRP is replaced by the RPM group of apps
 define(`GRP', `Archiving/Backup')dnl

branches/2.0.8/mindi/distributions/redhat/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
-define(`DDD', %{addreqb}, which, grep >= 2.5)dnl
+define(`DDD', `, which, grep >= 2.5')dnl
 dnl GRP is replaced by the RPM group of apps
-define(`GRP', Applications/Archiving)dnl
+define(`GRP', `Applications/Archiving')dnl

branches/2.0.8/mindi/distributions/rpm/mindi.spec

@@ -2 +2 @@
 # $Id$
 #
-%define name    mindi
-%define version VVV
 %define mrel    RRR
-%define src     SSS
-%define grp     GRP
-%define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools
-%define addreq  DDD
-%define rel     %{mrel}
+%define tag     TTT
 
 Summary:    Mindi creates emergency boot disks/CDs using your kernel, tools and modules
-Name:       %name
-Version:    %version
-Release:    %rel
+Name:       mindi
+Version:    VVV
+Release:    %mrel
 License:    GPL
-Group:      %{grp}
+Group:      GRP
 Url:        http://www.mondorescue.org
-Source:     %{src}
+Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-Requires:   %{addreq}
-Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
+Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools DDD
 # Not on all systems
 #Conflicts: bonnie++
@@ -32 +25 @@
 
 %prep
-%setup -n %name-%{version}
+%setup -n %name-%{version}-%{tag}
 
 %build
@@ -59 +52 @@
 
 %files
-%defattr(644,root,root,755)
 %config(noreplace) %{_sysconfdir}/mindi
 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt 
@@ -65 +57 @@
 %{_mandir}/man8/*
 %{_libdir}/mindi
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/mindi/aux-tools/sbin/*
-%attr(755,root,root) %{_libdir}/mindi/rootfs/bin/*
-%attr(755,root,root) %{_libdir}/mindi/rootfs/sbin/*
+%{_sbindir}/*
 
 %changelog

branches/2.0.8/mindi/distributions/suse/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', %{name}-%{version}.tgz)dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
-define(`DDD', %{addreqb}, syslinux)dnl
+define(`DDD', `, syslinux')dnl
 dnl GRP is replaced by the RPM group of apps
-define(`GRP', Productivity/Archiving/Backup)dnl
+define(`GRP', `Productivity/Archiving/Backup')dnl

branches/2.0.8/mindi/mindi

@@ -702 +702 @@
     pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-    cd $TMP_ROOT
-    else
-    cd /
+        cd $TMP_ROOT
+    else
+        cd /
     fi
     if [ ! -e "$1" ] ; then
-    LogIt "Warning - cannot search specific path '$1'\n"
-    return 1
+        LogIt "Warning - cannot search specific path '$1'\n"
+        return 1
     fi
     modpaths=`find $1 -name $2.*o -type f`
@@ -1222 +1222 @@
     echo "echo -en \"Loading your modules...\"" >> $outfile
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-    kver=$FAILSAFE_KVER
-    cd $TMP_ROOT
-    searchpath=lib/modules/$kver
+        kver=$FAILSAFE_KVER
+        cd $TMP_ROOT
+        searchpath=lib/modules/$kver
     else
 ###
@@ -1239 +1239 @@
 ### Sq-Modification end
 ###
-    searchpath=/lib/modules/$kver
+        searchpath=/lib/modules/$kver
     fi
     
@@ -2780 +2780 @@
     old_pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-    cd $TMP_ROOT
-    floppy_modules_path=lib/modules/$FAILSAFE_KVER
-    else
-    cd /
+        cd $TMP_ROOT
+        floppy_modules_path=lib/modules/$FAILSAFE_KVER
+    else
+        cd /
 ###
 ### Sq-Modification... Use kernel name in module path if specified.
@@ -2790 +2790 @@
         if [ "${kernelname}" != "" ]
         then
-          floppy_modules_path=lib/modules/${kernelname}
+            floppy_modules_path=lib/modules/${kernelname}
         else
-          floppy_modules_path=lib/modules/`uname -r`
+            floppy_modules_path=lib/modules/`uname -r`
         fi
 ###
@@ -2800 +2800 @@
     floppy_modules=""
     if [ "$disksize" -lt "2880" ] ; then
-        list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
+        list_of_groovy_mods="$FLOPPY_MODS $IDE_MODS ide-scsi sr_mod `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     else
         list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
@@ -2815 +2815 @@
     [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"
     for i in $list_of_groovy_mods ; do
-    floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
+        floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
     done
     for i in $floppy_modules ; do
         [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
-    [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
-    echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-    cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
-    [ "`echo "$i" | fgrep ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
+        [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
+        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
+        cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
+        [ "`echo "$i" | fgrep ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     done
 #    if [ -e "/dev/.devfsd" ] ; then

branches/2.0.8/mindi/parted2fdisk.pl

@@ -4 +4 @@
 #
 # parted2fdisk: fdisk like interface for parted 
-# [developped for mindi/mondo http://mondorescue.berlios.de]
+# [developped for mindi/mondo http://www.mondorescue.org]
 #
 # Aims to be architecture independant (i386/ia64)

branches/2.0.8/mondo-doc/VERSION

@@ -1 @@
-stable
+2.0.8

branches/2.0.8/mondo/ChangeLog

@@ -2 +2 @@
 
 MONDO CHANGES
+
+2.0.8 (2006-05-25)
+- new build process (Bruno Cornec)
+- Fix a bug in .spec for RPM build (%attr now unused)
+  (Bruno Cornec)
+- Support of dm and LVM v2 (Andree Leidenfrost)
+- New mr_strtok functionn added and used for dm support (Andree Leidenfrost)
+- Complete doc is now a separate package. mondo still contains the 
+  man pages and howto in minimal useful formats
+  (Bruno Cornec)
+- HOWTO now contains a new chapter on unattended support for mondo
+- Increase size (4 times) of include|exclude variables
+- Fix a bug on -I and -E not working with multiple parameters
+- Fix a bug in verify for NFS by swapping nfs_remote_dir and isodir when
+  assembling name for image file to verify
+  (Andree Leidenfrost)
+- Fix mondo when restoring filenames containing blanks 
+  (still a problem for filenames with ')
+  (Bruno Cornec)
+- Fix a RPM generation bug for rh7.3 (i386-redhat-linux prefix for binaries)
+  (Bruno Cornec)
 
 2.0.7 (2006-03-10)

branches/2.0.8/mondo/configure.in

@@ -1 +1 @@
 dnl Autoconfigure file for Mondo Rescue v2.0x
-dnl Mondo by Hugo Rabson
+dnl Mondo by Mondo dev team
 dnl This script by Joshua Oreman
 dnl

branches/2.0.8/mondo/distributions/gentoo/mondo.ebuild

@@ -1 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
 # $Id$
 
@@ -7 +9 @@
 DESCRIPTION="The premier GPL disaster recovery solution."
 HOMEPAGE="http://www.mondorescue.org"
-SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}.tgz"
+SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}-${PR}.tgz"
 
 LICENSE="GPL-2"
@@ -27 +29 @@
     >=sys-boot/syslinux-1.52"
 
-S=${WORKDIR}/${PN/-rescue/}-${PV}
+S=${WORKDIR}/${PN/-rescue/}-${PV}-${PR}
 
 src_unpack() {
@@ -38 +40 @@
     elibtoolize
     econf || die "Configuration failed"
-    emake || die "Make failed"
-    #make VERSION=VVV CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+    emake VERSION=VVV || die "Make failed"
 }
 
 src_install() {
-    #make install DESTDIR=${D} || die "make install failed"
-    einstall || die "Install failed"
+    make install DESTDIR=${D} || die "make install failed"
+    #einstall || die "Install failed"
     exeinto /usr/share/mondo
     doexe mondo/autorun
@@ -54 +55 @@
     einfo "Or visit the website @ ${HOMEPAGE}"
     echo
-    ewarn "This package is still in unstable."
+    ewarn "This package is a new version after a long gap."
     ewarn "Please report bugs to http://bugs.gentoo.org/"
     ewarn "However, please do an advanced query to search for bugs"

branches/2.0.8/mondo/distributions/mandriva/changelog

@@ -9 +9 @@
 - Add -p option
 
-* Tue May 03 2005 Hugo Rabson <hugorabson@msn.com> 2.04_cvs_20050503
-
-- made mondo more clever about finding its home. Avoids mondo considering
-  directories like '/usr/share/doc/momdo' as its home.
-
-* Wed Aug 04 2004 Hugo Rabson <hugorabson@msn.com> 2.03
-
-- test sanity of user-specified tempdir
-- better SLES8 support
-
-* Mon Jun 28 2004 Hugo Rabson <hugorabson@msn.com> 2.02
-
-- instead of using 'dd' to erase partition table, delete existing
-  partitions w/ the same call to fdisk that is used to create the
-  new partitions; this should avoids locking up the partition table
-- set bootable partition in the above same call to fdisk, for
-  the same reason (avoids locking up the partition table)
-- better software RAID support
-- mount ext3 partitions as ext2 when restoring - better for Debian
-- better star, ACL support
-- added ACL, xattr support for afio users
-
-* Sat Jun 26 2004 Hugo Rabson <hugorabson@msn.com> 2.01
-
-- fixed cvs for SuSE systems
-- fixed NTFS backup/restore bug relating to partimagehack
-  log file overflow and NTFS v non-NTFS differentiation
-- more reliable extraction of config info from CDs, floppies
-- better support of ISO dirs at restore-time (Conor Daly)
-- fixed spec file for SuSE users
-- added ldconfig to install section
-
-* Sat Jun 19 2004 Hugo Rabson <hugorabson@msn.com> 2.00
-
-- first 2.0 release
-- updated grub-install.patched to support SuSE and Red Hat 
-- call 'mt' to set block size to 32K before opening in/out tape
-- updated mondo-prep.c to create each disk's partitions all at once
-  (one call per drive) instead of one call to fdisk per partition
-- when extracting cfg file and mountlist from all.tar.gz (tape copy),
-  use block size of INTERNAL_TAPE_BLK_SIZE, not TAPE_BLOCK_SIZE
-- added star and rudimentary SELinux support
-- fixed lots of bugs
-- all logging now goes to /var/log/mondo-archive.log, with symlink
-  to /tmp/mondo-restore.log for restore-time log-tracking
-- added grub-install.patched
-- removed embleer & other binaries
-- added '-b' to specify block size
-- added '-R' for star support
-
-* Thu Mar 25 2004 Bruno Cornec <Bruno.Cornec@hp.com> 1.7_cvs-20040325
-
-- ia64 fixes
-
-* Fri Nov 07 2003 Joshua Oreman <oremanj@get-linux.org> 1.7_cvs-20031107
-
-- fixed symbolic links for libraries
-- added support for boot/root multi floppies
-
-- added kdelibs as xmondo dependency
-- added xmondo pixmap installation
-- better find_cdrom_device(), to cope w/ multiple CD writers
-- fixed -m and -Vc flags
-- fixed NTFS support!
-- bootable CD uses native, not El Torito, support now
-- removed mondo-makefilelist
-- added 2.6 kernel support
-- if 2.6 kernel, insist that the user specify CD device
-- drop Embleer; insist on ms-sys and parted if Windows partition
-
-* Wed Nov 05 2003 Jesse Keating <jkeating@j2solutions.net> 1.7_cvs-20031105.1
-
-- added -devel package
-
-* Tue Nov 04 2003 Jesse Keating <jkeating@j2solutions.net> 1.7_cvs-20031104.1
-
-- made xmondo a second package
-- added ability to specify --without xmondo at build time
-
-* Sun Nov 02 2003 Jesse Keating <jkeating@j2solutions.net> 1.7_cvs-20031102.1
-
-- Clean up, added spanish translation
-- Set prefix to be /usr
-- added/fixed Requires
-- remove CVS directories prior to building
-
-* Thu Oct 23 2003 Hugo Rabson <hugorabson@msn.com> 1.75_cvs_20031023
-
-- nothing yet
-
-* Wed Oct 22 2003 Hugo Rabson <hugorabson@msn.com> 1.75
-
-- fixed chmod/chown bug (Jens Richter)
-- ask user to confirm NFS mountpoint in Interactive Mode
-- rewritten format_everything() to make sure LVMs, RAIDs and
-  regular partitions are prepped in the correct order
-- better magicdev support
-- rewritten external binary caller subroutine
-- DVD support added
-- better backup-time control gui; offer to exclude nfs if appl.
-- fixed multi-tape support
-- re-implemented -D and -J
-- fixed bug in extract_config_file_from_ramdisk() which
-  affected tape+floppy users
-- updated is_incoming_block_valid() to make it
-  return end-of-tape if >300 flotsam blocks
-- unmount CD-ROM before burning (necessary for RH8/9)
-- fixed some stray assert()'s
-- fixed bug in grub-MR (Christian)
-- make user remove floppy/CD before restoring interactively from tape
-- fixed bug in am_I_in_disaster_recovery_mode()
-- added code to nuke_mode() to make sure NFS
-  (backup) share is mounted in Nuke Mode
-- improved tape device detection code
-- better GRUB support
-- better logging of changed bigfiles at compare-time
-- better NTFS support, thanks to partimagehack-static
-- better logging
-- rewrote tape-handling code, breaking compatibility w/ previous versions
-- fixed ISO/CD biggiefile verification bug in mondoarchive
-- fixed bug which stopped boot/compare-time changelist from popping up
-- replaced mondo-makefilelist with C code - faster, cleaner
-- tweaked GUI - better feedback
-
-* Wed May 28 2003 Anonymous <root@rohan> 1.74
-
-- misc fixes (Michael Hanscho's friend)
-- added rudimentary support for SME
-- added better label support
-- fixed biggietime atime/ctime restoration bug 73
-- fixed 'default boot loader' detection bug (Joshua Oreman)
-- use single-threaded make_afioballs_and_images() if FreeBSD
-- fixed mondoarchive -Vi multi-CD verify bug (Tom Mortell)
-- superior get_phys_size_of_drive() (Joshua Oreman)
-- fixed RAID-related bug in where_is_root_mounted()
-- ISO tweaks
-- fixed silly bug in load_filelist() which stopped
-  funny German filenames from being handled properly
-- fixed various calls to popup_and_get_string()
-- fixed spec file
-- reject -E /
-- added partimagehack to the mix
-
-* Tue May 20 2003 Anonymous <root@rohan> 1.73
-
-- mark devices as bootable _after_ unmounting them
-- resolve boot device (-f) if softlink
-- post_param_configuration() --- store iso-dev and isodir
-- added post-nuke-sample.tgz to package
-- Nuke Mode now checks mountlist against hardware; offer user
-  opportunity to edit mountlist if insane; if user declines, abort
-- added lots of assert()'s and other checks
-- ran code thru Valgrind to catch & fix some memory leaks
-- made mondo-restore.c smaller by moving some subroutines to
-  common/libmondo-raid.c and mondorestore/mondo-rstr-compare.c
-- added '-Q' to let user test mondoarchive's ability to find
-  their boot loader and type
-- improved which_boot_loader()
-- when burning or comparing to a CD, defeat autorun if it is
-  running, to avoid confusing mondoarchive and the user
-- if original backup media no longer available at boot-time
-  then offer user chance to choose another media source
-- when booting, type 'nuke noresize' to nuke w/o resizing
-  mountlist to fill your drives
-- add 'textonly' when booting, to avoid using Newt gui
-- run nice(20) to prioritize mondoarchive at start
-- don't pause and wait for next blank CD at backup-time
-  unless necessary (e.g. previous CD has not been removed)
-- get_phys_size_of_drive() --- better support of older drives
-- don't eject if "donteject" is in kernel's command line
-- cleaned up segfault-handling
-- added Conor's strip_path() to improve file list display
-- added Herman Kuster's multi-level bkp patch
-- better boot-time screen/message
-- added Joshua Oreman's FreeBSD patches x3
-- fixed interactive/textonly support
-- fixed support for subdir-within-NFS-mount
-- fixed "Can't backup if ramdisk not mounted" bug
-- try to work around eccentricities of multi-CD drive PCs
-- misc clean-ups (Steve Hindle)
-
-* Tue Apr 08 2003 Hugo Rabson <hugorabson@msn.com> 1.72
-
-- LVM/RAID bugs fixed (Brian Borgeson)
-- major clean-up of code (Stan Benoit)
-- make-me-bootable fix (Juraj Ziegler)
-- fixed problem w/ multi-ISO verify cycle (Tom Mortell)
-- removed duplicate entry from makefile
-- if root is /dev/root then assume not a ramdisk
-- reject relative paths if -d flag (Alessandro Polverini)
-- fixed potentially infinite loop in log_to_screen (Tom Mortell)
-- add '/' to custom filelist as workaround for obscure bug
-- ask user speed of CDRW if writing to CD
-- find_cdrom_device() --- if nonexistent/not found then
-  make sure to return '' as dev str and 1 as res
-- tweaked restore scripts tgz
-- cleaned up find_cdrom_device()
-- if user creates /usr/share/mondo/payload.tgz then untar
-  payload to CD at backup-time
-- fixed insist_on_this_cd_number()
-- fixed am_i_in_disaster_recovery_mode()
-- misc clean-up (Tom Mortell)
-- made code more legible
-- fixed post-nuke support
-- added -e support
-- fixed nfs support
-- fixed iso support
-- at restore-time, only sort mountlist internally, 
-  in mount_all_devices() and unmount_all_devices() 
-- fixed cosmetic bug in label-partitions-as-necessary
-- updated documentation
-- fixed fstab-hacking scripts
-
-* Wed Feb 12 2003 Hugo Rabson <hugorabson@msn.com> 1.71
-
-- log newt, slang, ncurses info
-- updated man page
-- handle % chars in issue.net properly (Heiko Schlittermann)
-- fixed serious NFS restore bug
-- cleaned up spec file; it should cause fewer problems now (Jesse Keating)
-- changed various strcpy() calls to strncpy() calls
-- added mondo-makefilelist to makefile (Mikael Hultgren)
-- mount_cdrom() better at handling multiple CD drives
-- exclude /media/cdrom,cdrecorder,floppy
-- sensibly_set_tmpdir_and_scratchdir() --- exclude smb and smbfs
-- better logging by eval_call_to_make_ISO()
-- accept -J <fname> to let user provide their own fs catalog
-  instead of -I <paths> to backup
-- if dir excluded with -E or included with -I and dir is actually
-  a softlink then exclude/include the dir pointed to, as well
-- better location for manpage
-- adjusted block size of tarball at start of tape, to help
-  users w/ broken tape driver firmware
-- sort -u fstab after modifying it
-- if backup type is nfs then don't estimate noof media
-- fixed Makefile (Mikael Hultgren)
-- updated manpage
-
-* Sat Dec 07 2002 Hugo Rabson <hugo@firstlinux.net> 1.70
-
-- new devel branch opened
-
-* Mon Dec 02 2002 Hugo Rabson <hugo@firstlinux.net> 1.52
-
-- fixed bug in multithreading
-- use new grub-MR instead of grub-install
-- wipe only the partition table (not the MBR) when partitioning drives
-- ignore lilo.conf.anaconda when looking for lilo.conf file
-- accepts '-l RAW' to backup/restore original boot sector instead
-  of running grub or lilo to init it after restoring
-- fixed&updated stabgrub-me script; software RAID + GRUB work now
-- mount/unmount /boot partition for Gentoo 1.2 users
-- re-enabled extra tape checksums
-- disabled spurious warnings
-- unmount/remount supermounts at start/end of live restore, if nec.
-- cleaned up mondo's tape block handling (now, TAPE_BLOCK_SIZE=128K
-  and I've added INTERNAL_TAPE_BLK_SIZE=32K variable for buffering)
-- added Makefile
-- added -l RAW, to backup and restore original MBR
-- cleaned up iso_mode() and nfs restoring
-- create /mnt/RESTORING/mnt/.boot.d for Gentoo users
-- made mondorestore CD bootable for ArkLinux users
-- if user runs as 'su' not 'su -' then work around
-
-* Sun Nov 17 2002 Hugo Rabson <hugo@firstlinux.net> 1.51
-
-- pop-up list of changed files, at end of verification phase
-- better handling of changed.files list at restore-time
-- lots of CD-related fixes
-- added '-N' flag --- to let user exclude all NFS-related mounts&devices
-- better handling of 'kill'
-- restructuring of code to ease integration of mondo w/XMondo
-- fixed obscure bug in find_and_mount_actual_cd()
-- if / or /root has <50MB free then abort & complain
-- fixed install.sh
-- fixed .spec file
-- updated documentation
-- commented code
-- updated man page
-- added -v / --version flag
-- replace convoluted grep with wc (KP)
-- fixed bug affecting restoration of bigfiles from CD's created w/0 compression
-- fixed BurnProof-related bug
-- better at figuring out which is the best partition for temp/scratchdir
-- added do-not-compress-these (text file) to RPM
-- do not compress files of types listed in do-not-compress-these
-- dropped -U from call to afio - saves 20-30% runtime (Cosgrove)
-- added Cosgrove's do-not-compress-these list
-- included various patches from KP
-- chmod tmpdir, scratchdir to 700 before using
-- restore from specified backup device, even if its own cfg file disagrees
-- fixed multi-tape bug
-- fixed "Can't find first ISO when verifying nonbootable ISO" bug
-- multithreaded make_afioballs_and_images()
-- tmpdir and scratchdir are set sensibly whether mondoarchive is called with
-  command-line parameters or not
-- fixed bug in strip_spaces() which stopped it from handling
-  small strings correctly - affected mountlist editor
-- create a repaired copy of grub-install which is RAID-friendly;
-  use it when initializing boot sector with run_grub()
-- fixed bug in mondo-makefilelist
-
-* Sun Sep 08 2002 Hugo Rabson <hugo@firstlinux.net> 1.50
-
-- if restoring, don't try to find SCSI node of CD-ROM drive; find /dev entry
-- during selective restore, skip filesets which don't contain relevant archives
-- set /dev/null's perms to 777, just in case devfs-enabled kernel mangles it
-- remove /var/run/*.pid after restoring
-- move spurious lockfiles from /home/* to /home/*/.disabled
-- ask user to confirm the tape/CD device name
-- lots of multitape-related fixes
-- added code to autodetect the hardware of the user, if possible
-- if isodir does not exist then abort
-- more sanity-checking for -d flag
-- doubled 'biggiefile' threshold... to 32MB
-- exclude /root/images/mindi
-- fixed multi-imagedev bug (Emmanuel Druon)
-- unmount/remount /mnt/floppy before/after backing up, if Mandrake
-- restructured the source files
-- fixed serious bug in line 1546 - should have been !=, not ==; stopped
-  mondorestore from correctly restoring big files
-- added '#include <signal.h>' to my-stuff.h
-- exclude "incheckentry xwait()" from changed.files
-- fixed minor bug in find_cdrom_device()
-- fixed bug in friendly_sizestr...
-- insist on tape #1 when start verifying
-- added internal buffering, replacing the external 'buffer' exe
-- if differential backup then don't permit formatting or fdisking,
-  whether Interactive or Nuke mode
-- if mondorestore is run on live filesystem (or from ramdisk) without
-  parameters then mondorestore will ask which backup media (tape, CD, etc.)
-  was used; it will read the config file from the media and proceed from there
-- if tape streamer is softlink then resolve it first
-- incorporate post-nuke tarball
-- if user doesn't specify tape size, proceed anyway; behave intelligently
-  in the event of end-of-tape
-- prefix bkpinfo->restore_path to biggiefile fname before generating
-  checksum & comparing to archived biggiefile
-- if /etc/lilo.conf not found not /etc/lilo.conf.anaconda found
-  then create a softlink from the former to the latter, to work
-  around RH7.3's b0rken LILO support
-- LFS support (mharris, michele, hugo)
-- fixed verify bug --- CD#1 was being verified again & again & ...
-- differential mode fixed; supported again
-- ask user for boot loader + device if not detectible
-- list up to 512 files in file selection window at once (was 128)
-- better handling of bigfiles' checksums, perms and owns
-- delete final filelist if <=2 bytes long
-- if kernel not found and mondo in graphics mode then popup and ask
-  for kernel path+filename
-
-* Sun Jul 14 2002 Hugo Rabson <hugo@firstlinux.net> 1.45-1
-
-- 1.5x branch forked off from 1.4x branch
-

branches/2.0.8/mondo/distributions/mandriva/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', `%{name}-%{version}.tar.bz2')dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.bz2')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
-define(`DDD', `%{addreqb}')dnl
+define(`DDD', )dnl
 dnl GRP is replaced by the RPM group of apps
 define(`GRP', `Archiving/Backup')dnl
-dnl OBS is replaced vy what is being obsoleted
+dnl OBS is replaced with what is being obsoleted
 define(`OBS', `Obsoletes:   libmondo <= 2.04
 Provides:   libmondo')dnl

branches/2.0.8/mondo/distributions/redhat/changelog

@@ -1 @@
-* Fri Feb 17 2006 Bruno Cornec <bruno@mondorescue.org> VVV
+* Fri Feb 17 2006 Bruno Cornec <bruno@mondorescue.org> 2.0.7-1
 - Updated to 2.0.7
 - RPM sepc files are now generated

branches/2.0.8/mondo/distributions/redhat/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
-define(`DDD', %{addreqb})dnl
+define(`DDD', )dnl
 dnl GRP is replaced by the RPM group of apps
-define(`GRP', Applications/Archiving)dnl
+define(`GRP', `Applications/Archiving')dnl
 dnl OBS is replaced vy what is being obsoleted
 define(`OBS', )dnl

branches/2.0.8/mondo/distributions/rpm/mondo.spec

@@ -3 +3 @@
 #
 
-%define name    mondo
-%define version VVV
 %define mrel    RRR
+%define tag     TTT
 # if mandriva official build (rpm --with is_official)
 %{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
-%define src     SSS
-%define grp     GRP
-%define addreqb mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
-%define addreq  DDD
-%define rel     %{mrel}
+%define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1 DDD
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
@@ -19 +14 @@
 Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
 
-Name:       %{name}
-Version:    %{version}
-Release:    %{rel}
+Name:       mondo
+Version:    VVV
+Release:    %{mrel}
 License:    GPL
-Group:      %{grp}
+Group:      GRP
 Url:        http://www.mondorescue.org
-Source:     %{src}
+Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
-Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
 OBS
 %ifarch ia64
@@ -65 +59 @@
 
 %prep
-%setup -q -n %name-%{version}
+%setup -q -n %name-%{version}-%{tag}
 
 %build
@@ -79 +73 @@
 
 %files
-%defattr(644,root,root,755)
 %doc ChangeLog svn.log
 %doc INSTALL COPYING README TODO AUTHORS NEWS
 %doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf
 
+<<<<<<< .working
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_datadir}/%{name}/restore-scripts/%{name}/*
@@ -89 +83 @@
 %attr(755,root,root) %{_datadir}/%{name}/post-nuke.sample/usr/bin/post-nuke
 %{_datadir}/%{name}/*
+=======
+%{_sbindir}/*
+%{_datadir}/%{name}
+>>>>>>> .merge-right.r575
 %{_mandir}/man8/*
 

branches/2.0.8/mondo/distributions/suse/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', %{name}-%{version}.tgz)dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
-define(`DDD', %{addreqb}, buffer, cdrecord)dnl
+define(`DDD', `, buffer, cdrecord')dnl
 dnl GRP is replaced by the RPM group of apps
-define(`GRP', Productivity/Archiving/Backup)dnl
+define(`GRP', `Productivity/Archiving/Backup')dnl
 dnl OBS is replaced vy what is being obsoleted
 define(`OBS', )dnl

branches/2.0.8/mondo/mondo/common/libmondo-raid-EXT.h

@@ -53 +53 @@
 #endif
 
-extern int create_raidtab_from_mdstat(char *, char *);
-extern int read_mdstat(struct s_mdstat *mdstat, char *mdstat_file);
-
-extern int create_raidtab_from_mdstat(char *raidtab_fname,
-                                      char *mdstat_fname);
+extern int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix);
+extern int create_raidtab_from_mdstat(char *raidtab_fname);

branches/2.0.8/mondo/mondo/common/libmondo-raid.c

@@ -395 +395 @@
 
     fprintf(fout, "raiddev %s\n", raidrec->raid_device);
-    if (raidrec->raid_level == -1) {
+    if (raidrec->raid_level == -2) {
+        fprintf(fout, "    raid-level            multipath\n");
+    } else if (raidrec->raid_level == -1) {
         fprintf(fout, "    raid-level            linear\n");
     } else {
@@ -401 +403 @@
                 raidrec->raid_level);
     }
-    fprintf(fout, "    chunk-size            %d\n", raidrec->chunk_size);
     fprintf(fout, "    nr-raid-disks         %d\n",
             raidrec->data_disks.entries);
-    fprintf(fout, "    nr-spare-disks        %d\n",
-            raidrec->spare_disks.entries);
+    if (raidrec->spare_disks.entries > 0) {
+        fprintf(fout, "    nr-spare-disks        %d\n",
+                raidrec->spare_disks.entries);
+    }
     if (raidrec->parity_disks.entries > 0) {
         fprintf(fout, "    nr-parity-disks       %d\n",
                 raidrec->parity_disks.entries);
     }
-
     fprintf(fout, "    persistent-superblock %d\n",
             raidrec->persistent_superblock);
+    if (raidrec->chunk_size > -1) {
+      fprintf(fout, "    chunk-size            %d\n", raidrec->chunk_size);
+    }
+    if (raidrec->parity > -1) {
+      switch(raidrec->parity) {
+      case 0:
+        fprintf(fout, "    parity-algorithm      left-asymmetric\n");
+        break;
+      case 1:
+        fprintf(fout, "    parity-algorithm      right-asymmetric\n");
+        break;
+      case 2:
+        fprintf(fout, "    parity-algorithm      left-symmetric\n");
+        break;
+      case 3:
+        fprintf(fout, "    parity-algorithm      right-symmetric\n");
+        break;
+      default:
+        fatal_error("Unknown RAID parity algorithm.");
+        break;
+      }
+    }
     save_additional_vars_to_file(&raidrec->additional_vars, fout);
     fprintf(fout, "\n");
@@ -713 +737 @@
 
     if (!strcmp(label, "raid-level")) {
-        if (!strcmp(value, "linear")) {
+        if (!strcmp(value, "multipath")) {
+            raidrec->raid_level = -2;
+        } else if (!strcmp(value, "linear")) {
             raidrec->raid_level = -1;
         } else {
@@ -726 +752 @@
     } else if (!strcmp(label, "chunk-size")) {
         raidrec->chunk_size = atoi(value);
+    } else if (!strcmp(label, "parity-algorithm")) {
+        if (!strcmp(value, "left-asymmetric")) {
+            raidrec->parity = 0;
+        } else if (!strcmp(value, "right-asymmetric")) {
+            raidrec->parity = 1;
+        } else if (!strcmp(value, "left-symmetric")) {
+            raidrec->parity = 2;
+        } else if (!strcmp(value, "right-symmetric")) {
+            raidrec->parity = 3;
+        } else {
+            log_msg(1, "Unknown RAID parity algorithm '%s'\n.", value);
+        }
     } else if (!strcmp(label, "device")) {
         get_next_raidtab_line(fin, labelB, valueB);
@@ -972 +1010 @@
 
 
-int read_mdstat(struct s_mdstat *mdstat, char *mdstat_file)
-{
-    FILE *fin;
-    char *tmp;
-    char *stub;
-    char *incoming;
-    char *raid_devname;
-    char *p, *q, *r;
-    int diskno;
-
-    malloc_string(tmp);
-    malloc_string(stub);
-    malloc_string(incoming);
-    malloc_string(raid_devname);
-    if (!(fin = fopen(mdstat_file, "r"))) {
-        log_msg(1, "%s not found", mdstat_file);
+int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix) {
+
+  const char delims[] = " ";
+
+  FILE   *fin;
+  int    res = 0, row, i, index_min;
+  int lastpos = 0;
+  size_t len = 0;
+  char   *token;
+  char *string = NULL;
+  char *pos;
+  char type;
+  char *strtmp;
+
+  // open file
+  if (!(fin = fopen(MDSTAT_FILE, "r"))) {
+    log_msg(1, "Could not open %s.\n", MDSTAT_FILE);
+    return 1;
+  }
+  // initialise record, build progress and row counters
+  raidlist->entries = 0;
+  raidlist->el[raidlist->entries].progress = 999;
+  row = 1;
+  // skip first output row - contains registered RAID levels
+  res = getline(&string, &len, fin);
+  // parse the rest
+  while ( !feof_unlocked(fin) ) {
+    res = getline(&string, &len, fin);
+    if (res <= 0) break;
+    // trim leading spaces
+    pos = string;
+    while (*pos == ' ') *pos++;
+    asprintf(&string, pos);
+    //
+    // if we have newline after only spaces, this is a blank line, update
+    // counters, otherwise do normal parsing
+    if (*string == '\n') {
+      row = 1;
+      raidlist->entries++;
+      raidlist->el[raidlist->entries].progress = 999;
+    } else {
+      switch (row) {
+      case 1:  // device information
+    // check whether last line of record and if so skip
+    pos = strcasestr(string, "unused devices: ");
+    if (pos == string) {
+      //raidlist->entries--;
+      break;
+    }
+    // tokenise string
+    token = mr_strtok (string, delims, &lastpos);
+    // get RAID device name
+    asprintf(&strtmp,"%s%s", device_prefix, token);
+    strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
+    paranoid_free(strtmp);
+    paranoid_free(token);
+    // skip ':' and status
+    token = mr_strtok (string, delims, &lastpos);
+    paranoid_free(token);
+    token = mr_strtok (string, delims, &lastpos);
+    if (!strcmp(token, "inactive")) {
+      log_msg(1, "RAID device '%s' inactive.\n",
+         raidlist->el[raidlist->entries].raid_device);
+      paranoid_free(string);
+      paranoid_free(token);
+      return 1;
+    }
+    paranoid_free(token);
+
+    // get RAID level
+    token = mr_strtok (string, delims, &lastpos);
+    if (!strcmp(token, "multipath")) {
+      raidlist->el[raidlist->entries].raid_level = -2;
+    } else if (!strcmp(token, "linear")) {
+      raidlist->el[raidlist->entries].raid_level = -1;
+    } else if (!strcmp(token, "raid0")) {
+      raidlist->el[raidlist->entries].raid_level = 0;
+    } else if (!strcmp(token, "raid1")) {
+      raidlist->el[raidlist->entries].raid_level = 1;
+    } else if (!strcmp(token, "raid4")) {
+      raidlist->el[raidlist->entries].raid_level = 4;
+    } else if (!strcmp(token, "raid5")) {
+      raidlist->el[raidlist->entries].raid_level = 5;
+    } else if (!strcmp(token, "raid6")) {
+      raidlist->el[raidlist->entries].raid_level = 6;
+    } else if (!strcmp(token, "raid10")) {
+      raidlist->el[raidlist->entries].raid_level = 10;
+    } else {
+      log_msg(1, "Unknown RAID level '%s'.\n", token);
+      paranoid_free(string);
+      paranoid_free(token);
+      return 1;
+    }
+    paranoid_free(token);
+
+    // get RAID devices (type, index, device)
+    // Note: parity disk for RAID4 is last normal disk, there is no '(P)'
+    raidlist->el[raidlist->entries].data_disks.entries = 0;
+    raidlist->el[raidlist->entries].spare_disks.entries = 0;
+    raidlist->el[raidlist->entries].failed_disks.entries = 0;
+    while((token = mr_strtok (string, delims, &lastpos))) {
+      if ((pos = strstr(token, "("))) {
+        type = *(pos+1);
+      } else {
+        type = ' ';
+      }
+      pos = strstr(token, "[");
+      *pos = '\0';
+      switch(type) {
+      case ' ': // normal data disks
+        raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
+        asprintf(&strtmp,"%s%s", device_prefix, token);
+        strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
+        paranoid_free(strtmp);
+        raidlist->el[raidlist->entries].data_disks.entries++;
+        break;
+      case 'S': // spare disks
+        raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
+        asprintf(&strtmp,"%s%s", device_prefix, token);
+        strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
+        paranoid_free(strtmp);
+        raidlist->el[raidlist->entries].spare_disks.entries++;
+        break;
+      case 'F': // failed disks
+        raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
+        asprintf(&strtmp,"%s%s", device_prefix, token);
+        strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
+        paranoid_free(strtmp);
+        raidlist->el[raidlist->entries].failed_disks.entries++;
+        log_it("At least one failed disk found in RAID array.\n");
+        break;
+      default: // error
+        log_msg(1, "Unknown device type '%c'\n", type);
+        paranoid_free(string);
+        paranoid_free(token);
+        return 1;
+        break;
+      }
+      paranoid_free(token);
+    }
+
+    // adjust index for each device so that it starts with 0 for every type
+    index_min = 99;
+    for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
+      if (raidlist->el[raidlist->entries].data_disks.el[i].index < index_min) {
+        index_min = raidlist->el[raidlist->entries].data_disks.el[i].index;
+      }
+    }
+    if (index_min > 0) {
+      for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
+        raidlist->el[raidlist->entries].data_disks.el[i].index = raidlist->el[raidlist->entries].data_disks.el[i].index - index_min;    
+      }
+    }
+    index_min = 99;
+    for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
+      if (raidlist->el[raidlist->entries].spare_disks.el[i].index < index_min) {
+        index_min = raidlist->el[raidlist->entries].spare_disks.el[i].index;
+      }
+    }
+    if (index_min > 0) {
+      for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
+        raidlist->el[raidlist->entries].spare_disks.el[i].index = raidlist->el[raidlist->entries].spare_disks.el[i].index - index_min;  
+      }
+    }
+    index_min = 99;
+    for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
+      if (raidlist->el[raidlist->entries].failed_disks.el[i].index < index_min) {
+        index_min = raidlist->el[raidlist->entries].failed_disks.el[i].index;
+      }
+    }
+    if (index_min > 0) {
+      for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
+        raidlist->el[raidlist->entries].failed_disks.el[i].index = raidlist->el[raidlist->entries].failed_disks.el[i].index - index_min;    
+      }
+    }
+    break;
+      case 2:  // config information
+    // check for persistent super block
+    if (strcasestr(string, "super non-persistent")) {
+      raidlist->el[raidlist->entries].persistent_superblock = 0;
+    } else {
+      raidlist->el[raidlist->entries].persistent_superblock = 1;
+    }
+    // extract chunk size
+    if (!(pos = strcasestr(string, "k chunk"))) {
+      raidlist->el[raidlist->entries].chunk_size = -1;
+    } else {
+      while (*pos != ' ') {
+        *pos--;
+        if (pos < string) {
+          log_it("String underflow!\n");
+          paranoid_free(string);
+          return 1;
+        }
+      }
+      raidlist->el[raidlist->entries].chunk_size = atoi(pos + 1);
+    }
+    // extract parity if present
+    if ((pos = strcasestr(string, "algorithm"))) {
+      raidlist->el[raidlist->entries].parity = atoi(pos + 9);
+    } else {
+      raidlist->el[raidlist->entries].parity = -1;
+    }
+    break;
+      case 3:  // optional build status information
+    if (!(pos = strchr(string, '\%'))) {
+      if (strcasestr(string, "delayed")) {
+        raidlist->el[raidlist->entries].progress = -1;  // delayed (therefore, stuck at 0%)
+      } else {
+        raidlist->el[raidlist->entries].progress = 999; // not found
+      }
+    } else {
+      while (*pos != ' ') {
+        *pos--;
+        if (pos < string) {
+          printf("ERROR: String underflow!\n");
+          paranoid_free(string);
+          return 1;
+        }
+      }
+      raidlist->el[raidlist->entries].progress = atoi(pos);
+    }
+    break;
+      default: // error
+    log_msg(1, "Row %d should not occur in record!\n", row);
+    break;
+      }
+      row++;
+    }
+  }
+  // close file
+  fclose(fin);
+  // free string
+  paranoid_free(string);
+  // return success
+  return 0;
+
+}
+
+
+
+
+int create_raidtab_from_mdstat(char *raidtab_fname)
+{
+    struct raidlist_itself *raidlist;
+    int retval = 0;
+
+    raidlist = malloc(sizeof(struct raidlist_itself));
+
+    // FIXME: Prefix '/dev/' should really be dynamic!
+    if (parse_mdstat(raidlist, "/dev/")) {
+        log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
         return (1);
     }
-    mdstat->entries = 0;
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
-        p = incoming;
-        if (*p != 'm' && *(p + 1) == 'm') {
-            p++;
-        }
-        if (strncmp(p, "md", 2)) {
-            continue;
-        }
-// read first line --- mdN : active raidX ............
-        mdstat->el[mdstat->entries].md = atoi(p + 2);
-        log_msg(8, "Storing /dev/md%d's info", atoi(p + 2));
-        while (*p != ':' && *p) {
-            p++;
-        }
-        while ((*p != 'r' || *(p + 1) != 'a') && *p) {
-            p++;
-        }
-        if (!strncmp(p, "raid", 4)) {
-            mdstat->el[mdstat->entries].raidlevel = *(p + 4) - '0';
-        }
-        p += 4;
-        while (*p != ' ' && *p) {
-            p++;
-        }
-        while (*p == ' ' && *p) {
-            p++;
-        }
-        for (diskno = 0; *p; diskno++) {
-            strcpy(stub, p);
-//      log_msg(1, "diskno=%d; tmp=%s", diskno, tmp);
-            q = strchr(stub, '[');
-            if (q) {
-                *q = '\0';
-                q++;
-                r = strchr(q, ']');
-                if (r) {
-                    *r = '\0';
-                }
-                mdstat->el[mdstat->entries].disks.el[diskno].index =
-                    atoi(q);
-            } else {
-                mdstat->el[mdstat->entries].disks.el[diskno].index = -1;
-                q = strchr(stub, ' ');
-                if (q) {
-                    *q = '\0';
-                }
-            }
-            sprintf(tmp, "/dev/%s", stub);
-            log_msg(8, "/dev/md%d : disk#%d : %s (%d)",
-                    mdstat->el[mdstat->entries].md, diskno, tmp,
-                    mdstat->el[mdstat->entries].disks.el[diskno].index);
-            strcpy(mdstat->el[mdstat->entries].disks.el[diskno].device,
-                   tmp);
-            while (*p != ' ' && *p) {
-                p++;
-            }
-            while (*p == ' ' && *p) {
-                p++;
-            }
-        }
-        mdstat->el[mdstat->entries].disks.entries = diskno;
-// next line --- skip it
-        if (!feof(fin)) {
-            fgets(incoming, MAX_STR_LEN - 1, fin);
-        } else {
-            continue;
-        }
-// next line --- the 'progress' line
-        if (!feof(fin)) {
-            fgets(incoming, MAX_STR_LEN - 1, fin);
-        } else {
-            continue;
-        }
-//  log_msg(1, "Percentage line = '%s'", incoming);
-        if (!(p = strchr(incoming, '\%'))) {
-            mdstat->el[mdstat->entries].progress = 999; // not found
-        } else if (strstr(incoming, "DELAYED")) {
-            mdstat->el[mdstat->entries].progress = -1;  // delayed (therefore, stuck at 0%)
-        } else {
-            for (*p = '\0'; *p != ' '; p--);
-            mdstat->el[mdstat->entries].progress = atoi(p);
-        }
-        log_msg(8, "progress =%d", mdstat->el[mdstat->entries].progress);
-        mdstat->entries++;
-    }
-    fclose(fin);
-    paranoid_free(tmp);
-    paranoid_free(stub);
-    paranoid_free(incoming);
-    paranoid_free(raid_devname);
-    return (0);
-}
-
-
-
-int create_raidtab_from_mdstat(char *raidtab_fname, char *mdstat_fname)
-{
-    struct raidlist_itself *raidlist;
-    struct s_mdstat *mdstat;
-    int retval = 0;
-    int i;
-
-    raidlist = malloc(sizeof(struct raidlist_itself));
-    mdstat = malloc(sizeof(struct s_mdstat));
-
-    if (read_mdstat(mdstat, mdstat_fname)) {
-        log_to_screen("Sorry, cannot read %s", mdstat_fname);
-        return (1);
-    }
-
-    for (i = 0; i < mdstat->entries; i++) {
-        sprintf(raidlist->el[i].raid_device, "/dev/md%d",
-                mdstat->el[i].md);
-        raidlist->el[i].raid_level = mdstat->el[i].raidlevel;
-        raidlist->el[i].persistent_superblock = 1;
-        raidlist->el[i].chunk_size = 4;
-        memcpy((void *) &raidlist->el[i].data_disks,
-               (void *) &mdstat->el[i].disks,
-               sizeof(struct list_of_disks));
-        // FIXME --- the above line does not allow for spare disks
-        log_to_screen
-            ("FIXME - create_raidtab_from_mdstat does not allow for spare disks");
-    }
-    raidlist->entries = i;
+
     retval += save_raidlist_to_raidtab(raidlist, raidtab_fname);
     return (retval);

branches/2.0.8/mondo/mondo/common/libmondo-raid.h

@@ -43 +43 @@
 #endif
 
-
-int create_raidtab_from_mdstat(char *, char *);
-int read_mdstat(struct s_mdstat *mdstat, char *mdstat_file);
-
-int create_raidtab_from_mdstat(char *raidtab_fname, char *mdstat_fname);
+int create_raidtab_from_mdstat(char *raidtab_fname);
+int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix);

branches/2.0.8/mondo/mondo/common/libmondo-string-EXT.h

@@ -44 +44 @@
 extern inline void turn_wildcard_chars_into_literal_chars(char *out,
                                                           char *in);
+/* Valid external functions */
+extern char *mr_strtok(char *instr, const char *delims, int *lastpos);

branches/2.0.8/mondo/mondo/common/libmondo-string.c

@@ -1 @@
-/* libmondo-string.c
-   $Id$
-
-- string manipulation
-
-
-08/02
-- added function turn_wildcard_chars_into_literal_chars()
-
-03/10/2004?
-- make percent_media_full_comment() use media_descriptor_string():
-  "DVD %d" or "ISO %d" (if that's what it is) rather than "CD %d"
-- fix build_partition_name() to use 'adXsY' rather than 'adXpY' on FreeBSD
-
-10/08/2003
-- changed 'CD %d' to '<media> %d' (msg)
-
-10/01
-- fixing strip_spaces() to handle /r properly
-
-09/26
-- added char *media_descriptor_string(t_bkptype);
-
-05/06
-- cleaned up severity_of_difference() a bit
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-- severity_of_difference() skips "/mnt/RESTORING" at start
-  of filename if it's there
-
-04/04/2003
-- misc clean-up (Tom Mortell)
-
-11/17/2002
-- strip_spaces() now accommodates _smaller_ strings auto'y
-
-11/08
-- if decimal point in string sent to friendly_sizestr_to_sizelong()
-  then fatal error: we expect integers only
-
-10/01 - 10/31
-- commented subroutines
-- strip_spaces() allows up to MAX_STR_LEN-len input string
-
-08/01 - 08/31
-- fixed bug in friendly_sizestr_to_sizelong() which stopped
-  it from working with capital G's and K's
-- fixed bug in build_partition_name()
-
-07/24
-- created
-*/
+/* $Id$ */
 
 
@@ -1212 +1157 @@
 }
 
+
+/* New functions safe from a memory manageemnt point of view */
+/* Developped by Andree Leidenfrost */
+
+char *mr_strtok(char *instr, const char *delims, int *lastpos) {
+
+char *token = NULL;
+char *strptr = NULL;
+size_t pos1 = 0;
+size_t pos2 = 0;
+
+if (strlen(instr) <= *lastpos) {
+    *lastpos = 0;
+    return token;
+}
+
+strptr = instr + *lastpos;
+pos2 = strspn(strptr, delims);
+strptr += pos2;
+pos1 = strcspn(strptr, delims);
+token = malloc(sizeof(*token)*(pos1+1));
+strncpy(token, strptr, pos1);
+*lastpos = *lastpos + pos1 + pos2 + 1;
+
+return token;
+}
 /* @} - end of stringGroup */

branches/2.0.8/mondo/mondo/common/libmondo-string.h

@@ -34 +34 @@
 char *media_descriptor_string(t_bkptype);
 inline void turn_wildcard_chars_into_literal_chars(char *out, char *in);
+
+/* Valid external functions */
+char *mr_strtok(char *instr, const char *delims, int *lastpos);

branches/2.0.8/mondo/mondo/common/libmondo-tools.c

@@ -442 +442 @@
     assert(raidrec != NULL);
     raidrec->raid_device[0] = '\0';
-    raidrec->raid_level = 0;
-    raidrec->chunk_size = 4;
+    raidrec->raid_level = -9;
     raidrec->persistent_superblock = 1;
+    raidrec->chunk_size = 64;
+    raidrec->parity = -1;
     raidrec->data_disks.entries = 0;
     raidrec->spare_disks.entries = 0;
@@ -1224 +1225 @@
         log_to_screen
             ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
-        create_raidtab_from_mdstat("/etc/raidtab", "/proc/mdstat");
+        create_raidtab_from_mdstat("/etc/raidtab");
     }
 

branches/2.0.8/mondo/mondo/common/mondostructures.h

@@ -150 +150 @@
    */
     int index;
+    
+  /**
+   * Type of disk.
+   */
+    char type;  // ' ' = data (default), S = spare, F = faulty
+    
 };
 
@@ -241 +247 @@
        */
     int chunk_size;
+    
+      /**
+       * The parity algorithm of this RAID device. (RAID5 only)
+       */
+    int parity; // 0=left-asymmetric, 1=right-asymmetric, 2=left-symmetric, 3=right-symmetric
 
       /**
@@ -266 +277 @@
        */
     struct additional_raid_variables additional_vars;
+
+      /**
+       * Resync progress for this device.
+       */
+    int progress;
 };
 
@@ -787 +803 @@
     struct s_tapecat_entry el[MAX_TAPECATALOG_ENTRIES];
 };
-
-
-
-struct s_mdrec {
-    int md;                     // /dev/mdN
-    int raidlevel;              // 0, 1, 5
-    struct list_of_disks disks;
-    int progress;
-};
-
-struct s_mdstat {
-    int entries;
-    struct s_mdrec el[MAXIMUM_RAID_DEVS];
-};

branches/2.0.8/mondo/mondo/common/my-stuff.h

@@ -231 +231 @@
  */
 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
+
+/**
+ * The RAID kernel proc file
+ */
+#define MDSTAT_FILE "/proc/mdstat"
 
 /**

branches/2.0.8/mondo/mondo/mondorestore/mondo-prep.c

@@ -695 +695 @@
 
 /**
+ * Create @p RAID device using information from @p structure.
+ * This will create the specified RAID devive using information provided in
+ * raidlist by means of the mdadm tool.
+ * @param raidlist The structure containing all RAID information
+ * @param device The RAID device to create.
+ * @return 0 for success, nonzero for failure.
+ */
+int create_raid_device_via_mdadm(struct raidlist_itself *raidlist, char *device)
+{
+  /** int **************************************************************/
+  int i   = 0;
+  int j   = 0;
+  int res = 0;
+  
+  /** buffers ***********************************************************/
+  char *devices = NULL;
+  char *strtmp  = NULL;
+  char *level   = NULL;
+  char *program = NULL;
+  
+  // leave straight away if raidlist is initial or has no entries
+  if (!raidlist || raidlist->entries == 0) {
+    log_msg(1, "No RAID arrays found.");
+    return 1;
+  } else {
+    log_msg(1, "%d RAID arrays found.", raidlist->entries);
+  }
+  // find raidlist entry for requested device
+  for (i = 0; i < raidlist->entries; i++) {
+    if (!strcmp(raidlist->el[i].raid_device, device)) break;
+  }
+  // check whether RAID device was found in raidlist
+  if (i == raidlist->entries) {
+    log_msg(1, "RAID device %s not found in list.", device);
+    return 1;
+  }
+  // create device list from normal disks followed by spare ones
+  asprintf(&devices, raidlist->el[i].data_disks.el[0].device);
+  for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
+    asprintf(&strtmp, "%s", devices);
+    paranoid_free(devices);
+    asprintf(&devices, "%s %s", strtmp,
+         raidlist->el[i].data_disks.el[j].device);
+    paranoid_free(strtmp);
+  }
+  for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
+    asprintf(&strtmp, "%s", devices);
+    paranoid_free(devices);
+    asprintf(&devices, "%s %s", strtmp,
+         raidlist->el[i].spare_disks.el[j].device);
+    paranoid_free(strtmp);
+  }
+  // translate RAID level
+  if (raidlist->el[i].raid_level == -2) {
+    asprintf(&level, "multipath");
+  } else if (raidlist->el[i].raid_level == -1) {
+    asprintf(&level, "linear");
+  } else {
+    asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+  }
+  // create RAID device:
+  // - RAID device, number of devices and devices mandatory
+  // - parity algorithm, chunk size and spare devices optional
+  // - faulty devices ignored
+  // - persistent superblock always used as this is recommended
+  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);
+  if (raidlist->el[i].parity != -1) {
+    asprintf(&strtmp, "%s", program);
+    paranoid_free(program);
+    switch(raidlist->el[i].parity) {
+    case 0:
+      asprintf(&program, "%s --parity=%s", strtmp, "la");
+      break;
+    case 1:
+      asprintf(&program, "%s --parity=%s", strtmp, "ra");
+      break;
+    case 2:
+      asprintf(&program, "%s --parity=%s", strtmp, "ls");
+      break;
+    case 3:
+      asprintf(&program, "%s --parity=%s", strtmp, "rs");
+      break;
+    default:
+      fatal_error("Unknown RAID parity algorithm.");
+      break;
+    }
+    paranoid_free(strtmp);
+  }
+  if (raidlist->el[i].chunk_size != -1) {
+    asprintf(&strtmp, "%s", program);
+    paranoid_free(program);
+    asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
+    paranoid_free(strtmp);
+  }
+  if (raidlist->el[i].spare_disks.entries > 0) {
+    asprintf(&strtmp, "%s", program);
+    paranoid_free(program);
+    asprintf(&program, "%s --spare-devices=%d", strtmp,
+         raidlist->el[i].spare_disks.entries);
+    paranoid_free(strtmp);
+  }
+  asprintf(&strtmp, "%s", program);
+  paranoid_free(program);
+  asprintf(&program, "%s %s", strtmp, devices);
+  paranoid_free(strtmp);
+  res = run_program_and_log_output(program, 1);
+  // free memory
+  paranoid_free(devices);
+  paranoid_free(level);
+  paranoid_free(program);
+  // return to calling instance
+  return res;
+}
+
+
+/**
  * Format @p device as a @p format filesystem.
  * This will use the format command returned by which_format_command_do_i_need().
@@ -704 +823 @@
  * @return 0 for success, nonzero for failure.
  */
-int format_device(char *device, char *format)
+int format_device(char *device, char *format, struct raidlist_itself *raidlist)
 {
     /** int **************************************************************/
@@ -836 +955 @@
 
         log_msg(1, "Making %s", device);
-        sprintf(program, "mkraid --really-force %s", device);
-        res = run_program_and_log_output(program, 1);
-        log_msg(1, "%s returned %d", program, res);
-        system("sync");
-        sleep(3);
-        start_raid_device(device);
-        if (g_fprep) {
-            fprintf(g_fprep, "%s\n", program);
+        // use mkraid if it exists, otherwise use mdadm
+        if (run_program_and_log_output("which mkraid", FALSE)) {
+            res = create_raid_device_via_mdadm(raidlist, device);
+            log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
+        } else {
+            sprintf(program, "mkraid --really-force %s", device);
+            res = run_program_and_log_output(program, 1);
+            log_msg(1, "%s returned %d", program, res);
+            system("sync");
+            sleep(3);
+            start_raid_device(device);
+            if (g_fprep) {
+                fprintf(g_fprep, "%s\n", program);
+            }
         }
         system("sync");
         sleep(2);
-
 //      log_to_screen("Starting %s", device);
 //      sprintf(program, "raidstart %s", device);
@@ -853 +977 @@
 //      log_msg(1, "%s returned %d", program, res);
 //      system("sync"); sleep(1);
-        if (g_fprep) {
-            fprintf(g_fprep, "%s\n", program);
-        }
 #endif
         system("sync");
@@ -923 +1044 @@
  * @return The number of errors encountered (0 for success).
  */
-int format_everything(struct mountlist_itself *mountlist,
-                      bool interactively)
+int format_everything(struct mountlist_itself *mountlist, bool interactively,
+                          struct raidlist_itself *raidlist)
 {
     /** int **************************************************************/
@@ -983 +1104 @@
             if (do_it) {
                 // NB: format_device() also stops/starts RAID device if necessary
-                retval += format_device(me->device, me->format);
+                retval += format_device(me->device, me->format, raidlist);
             }
             g_current_progress += progress_step;
@@ -1000 +1121 @@
     log_msg(1, "Creating LVMs");
     if (does_file_exist("/tmp/i-want-my-lvm")) {
-        wait_until_software_raids_are_prepped("/proc/mdstat", 10);
+        wait_until_software_raids_are_prepped("/proc/mdstat", 100);
         log_to_screen("Configuring LVM");
         if (!g_text_mode) {
@@ -1076 +1197 @@
 
             if (do_it)
-                retval += format_device(me->device, me->format);
+                retval += format_device(me->device, me->format, raidlist);
         }
 
@@ -2247 +2368 @@
     sprintf(program, "vinum stop -f %s", raid_device);
 #else
-    sprintf(program, "raidstop %s", raid_device);
-//      sprintf (program, "raidstop " RAID_DEVICE_STUB "*");
+    // use raidstop if it exists, otherwise use mdadm
+    if (run_program_and_log_output("which raidstop", FALSE)) {
+        sprintf(program, "mdadm -S %s", raid_device);
+    } else {
+        sprintf(program, "raidstop %s", raid_device);
+    }
 #endif
     log_msg(1, "program = %s", program);

branches/2.0.8/mondo/mondo/mondorestore/mondo-restore.c

@@ -837 +837 @@
                     }
 
-                    fmt_errs = format_everything(mountlist, FALSE);
+                    fmt_errs = format_everything(mountlist, FALSE, raidlist);
                     if (!fmt_errs) {
                         log_to_screen
@@ -855 +855 @@
                 if (ask_me_yes_or_no
                     ("Do you want to format your hard drives?")) {
-                    fmt_errs = format_everything(mountlist, TRUE);
+                    fmt_errs = format_everything(mountlist, TRUE, raidlist);
                     if (!fmt_errs) {
                         done = TRUE;
@@ -1162 +1162 @@
                 system("sync");
                 log_to_screen("Please wait. This may take a few minutes.");
-                res += format_everything(mountlist, FALSE);
+                res += format_everything(mountlist, FALSE, raidlist);
             }
             paranoid_fclose(g_fprep);
@@ -3415 +3415 @@
     }
 
-    if (argc == 4 && strcmp(argv[1], "--mdconv") == 0) {
-        finish(create_raidtab_from_mdstat(argv[2], argv[3]));
+    if (argc == 3 && strcmp(argv[1], "--mdconv") == 0) {
+        finish(create_raidtab_from_mdstat(argv[2]));
     }
 
@@ -3515 +3515 @@
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
-            res = format_everything(mountlist, FALSE);
+            res = format_everything(mountlist, FALSE, raidlist);
             finish(res);
         }

branches/2.0.8/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -2585 +2585 @@
                                            int wait_for_percentage)
 {
-    struct s_mdstat *mdstat;
+    struct raidlist_itself *raidlist;
     int unfinished_mdstat_devices = 9999, i;
     char *screen_message;
 
     malloc_string(screen_message);
-    mdstat = malloc(sizeof(struct s_mdstat));
+    raidlist = malloc(sizeof(struct raidlist_itself));
 
     assert(wait_for_percentage <= 100);
     iamhere("Help, my boat is sync'ing. (Get it? Urp! Urp!)");
     while (unfinished_mdstat_devices > 0) {
-        if (read_mdstat(mdstat, mdstat_file)) {
-            log_to_screen("Sorry, cannot read %s", mdstat_file);
+            // FIXME: Prefix '/dev/' should really be dynamic!
+        if (parse_mdstat(raidlist, "/dev/")) {
+            log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
+            log_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
-        for (unfinished_mdstat_devices = i = 0; i < mdstat->entries; i++) {
-            if (mdstat->el[i].progress < wait_for_percentage) {
+        for (unfinished_mdstat_devices = i = 0; i <= raidlist->entries; i++) {
+            if (raidlist->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;
-                sprintf(screen_message, "Sync'ing /dev/md%d",
-                        mdstat->el[i].md);
+                log_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
+                sprintf(screen_message, "Sync'ing %s",
+                        raidlist->el[i].raid_device);
                 open_evalcall_form(screen_message);
-                if (mdstat->el[i].progress == -1)   // delayed while another partition inits
+                if (raidlist->el[i].progress == -1) // delayed while another partition inits
                 {
                     continue;
                 }
-                while (mdstat->el[i].progress < wait_for_percentage) {
-                    update_evalcall_form(mdstat->el[i].progress);
+                while (raidlist->el[i].progress < wait_for_percentage) {
+                    log_msg(1,"Percentage sync'ed: %d", raidlist->el[i].progress);
+                    update_evalcall_form(raidlist->el[i].progress);
                     sleep(2);
-                    if (read_mdstat(mdstat, mdstat_file)) {
+                    // FIXME: Prefix '/dev/' should really be dynamic!
+                    if (parse_mdstat(raidlist, "/dev/")) {
                         break;
                     }
@@ -2621 +2626 @@
     }
     paranoid_free(screen_message);
-    paranoid_free(mdstat);
-}
+    paranoid_free(raidlist);
+}

branches/2.0.8/mondo/mondo/mondorestore/mondoprep.h

@@ -58 +58 @@
 int start_all_raid_devices(struct mountlist_itself *);
 int stop_all_raid_devices(struct mountlist_itself *);
-int format_everything(struct mountlist_itself *, bool);
+int format_everything(struct mountlist_itself *, bool, struct raidlist_itself *);
 int partition_device(FILE *, const char *, int, int, const char *,
                      long long);
@@ -65 +65 @@
 int partition_device_with_fdisk(FILE *, const char *, int, int,
                                 const char *, long long);
-int format_device(char *, char *);
+int format_device(char *, char *, struct raidlist_itself *);
 int partition_drive(struct mountlist_itself *, char *);
 int partition_everything(struct mountlist_itself *);

branches/2.0.8/mondo/mondo/mondorestore/mr-externs.h

@@ -27 +27 @@
 extern int edit_mountlist(char *mountlist_fname, struct mountlist_itself *,
                           struct raidlist_itself *);
-extern int format_everything(struct mountlist_itself *, bool);
-extern int format_device(char *, char *);
+extern int format_everything(struct mountlist_itself *, bool, struct raidlist_itself *);
+extern int format_device(char *, char *, struct raidlist_itself *);
 extern void finish(int);
 extern void free_filelist(struct s_node *);

branches/2.0.8/tools/common-env

@@ -1 +1 @@
 #!/bin/bash
 #
-# Creates common environment from SVN repository
+# Creates common environment 
 #
 # $Id$
@@ -8 +8 @@
 # Adapt to your needs
 export BASE=${HOME}/mondo
-
-# Should not be modified below
-dname=`dirname $0`
-export VER="branches/`cat $dname/../mondo/VERSION`"
-export TMP=${BASE}/tmp
-mkdir -p ${TMP}
-
-export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/VERSION`
-export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/VERSION`
-
-# To be safe for SVN commands
-cd $TOOLHOME/..
-export REVISION=`$TOOLHOME/mksvnversion`
+export TOPDIR=${BASE}/build
+mkdir -p ${TOPDIR}
+export TMPDIR=
+export TMP=`mktemp -d -p /tmp`

branches/2.0.8/tools/livwww

@@ -47 +47 @@
 
 . $TOOLHOME/common-env
+. $TOOLHOME/svn-env
 
 cd ${BASE}/svn
@@ -55 +56 @@
 fi
 
-svn export $optsvn ${VER}/website $LOCALDIR
+svn export $optsvn ${SVNBRANCH}/website $LOCALDIR
 
 if [ $force -eq 1 ]; then
@@ -62 +63 @@
 fi
 
-svn export $optsvn ${VER}/documentation $LOCALDOC
+svn export $optsvn ${SVNBRANCH}/mondo-doc $LOCALDOC
 
 #

branches/2.0.8/tools/mkdeliv

@@ -20 +20 @@
 fi
 
+. $TOOLHOME/common-env
+. $TOOLHOME/svn-env
 . $TOOLHOME/rpm-env
 

branches/2.0.8/tools/mkqemu

@@ -3 +3 @@
 # $Id$
 #
-# Script allowing mondo packages production on various distributions with qemu
+# Call virtual machine with qemu
 #
 
 if [ _"$1" == _"" ]; then
-    echo "Syntax: mkqemu [mondo version] ([vm].. )"
+    echo "Syntax: qemu vm"
     exit -1
+else
+    m=$1
 fi
 
-if [ _"$2" == _"" ]; then
-    export SVN_VM="mdk101 mdk102 mdv2006 rh73 rh9 fc4 fc5 rhel3 rhel4 suse10 sles9 debian31 slackware102 gentoo"
-else
-    export SVN_VM="$2"
-fi
+ipvm=10.0.2.15
 
-cat > /tmp/mkmondo << EOF
-#!/bin/bash
-
-export SVN_HOME=\$HOME/mondo/svn/branches
-export SVN_SSH="ssh -l bcornec"
-export SVN_EDITOR=vim
-export LANG="C"
-export LANGUAGE="C"
-export LC_ALL="C"
-
-if [ -d \$SVN_HOME/$1 ]; then
-    cd \$SVN_HOME/$1
-    svn up
-    if [ \$? != 0 ]; then
-            echo "Verify SVN installation"
-            exit -1
-    fi
-else
-    mkdir -p \$SVN_HOME
-    cd \$SVN_HOME
-    svn co svn+ssh://bcornec@svn.berlios.de/svnroot/repos/mondorescue/branches/$1 $1
-    if [ \$? != 0 ]; then
-            echo "Verify SVN installation"
-            exit -1
-    fi
-fi
-echo \$SVN_VM | grep -q "debian"
-if [ \$? -eq 0 ]; then
-    \$SVN_HOME/$1/tools/mkdeb < /dev/null
-else
-    echo \$SVN_VM | grep -q "slack"
-    if [ \$? -eq 0 ]; then
-        \$SVN_HOME/$1/tools/mkslack < /dev/null
-    else
-        echo \$SVN_VM | grep -q "gentoo"
-        if [ \$? -eq 0 ]; then
-            \$SVN_HOME/$1/tools/mkemerge < /dev/null
-        else
-            \$SVN_HOME/$1/tools/mkrpm < /dev/null
-        fi
-    fi
-fi
-\$SVN_HOME/$1/tools/mkdeliv
-EOF
-
-ipvm=10.0.2.15
-sp=2222
-
-for m in $SVN_VM; do
-    vmp=0
-    if [ ! -f /users/vmplayer/$m.qemu ]; then
-            echo "VM unaccessible. Verify NFS mount"
-            exit -1
-    fi
-    ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu
-    if [ $? -ne 0 ]; then
-        # Virtual machine alreday started
-        vmp=1
-        qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
-        sleep 300
-    fi
-    scp -P $sp /tmp/mkmondo bruno@localhost:
-    ssh -p $sp bruno@localhost "chmod 755 ./mkmondo ; ./mkmondo" | tee /tmp/mkvm.log
-    if [ $vmp -eq 1 ]; then
-        ssh -p $sp root@localhost "halt -p"
-        sleep 300
-        proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu | awk '{print $2}'`
-        if [ "$proces" != "" ]; then
-            kill $proces
-        fi
-    fi
-done
+qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu

branches/2.0.8/tools/qemu-vm.txt

@@ -44 +44 @@
 
 su - bruno
-mkdir -p mondo/tmp RPMS/BUILD RPMS/RPMS/i386 RPMS/RPMS/noarch RPMS/SOURCES RPMS/SPECS RPMS/SRPMS RPMS/tmp SRPMS tmp
+mkdir -p mondo/tmp build
 cat > ~bruno/.rpmmacros << EOF
-%_topdir    /home/bruno/RPMS
+%_topdir    /home/bruno/build
 %_tmppath   %{_topdir}/tmp
-%packager   Bruno Cornec <bruno@HyPer-Linux.org>
+%packager   Bruno Cornec <bruno@mondorescue.org>
 EOF
 cat > ~bruno/.rpmrc << EOF
@@ -66 +66 @@
 svn.berlios.de,195.37.77.137 ssh-dss AAAAB3NzaC1kc3MAAACBAKouB77l1f4FgdP6DjLOgq5RKuGYm3zMJlM4WHcKzWnPuErZW4Omxk1CO0JojDNj/bjxz/95blWbdonEcAo0v71GcZbECFDsJdgVbZM+yxLHKOF4S5uHkiJ+LMawFcRoCGAochowoP9jUfLVAzyT1q3dbvmL43YO3FDvD+mCKTbZAAAAFQCWs/2nOqvitE/CyOCa81sadnzsPQAAAIBrgWRs2VN6jAtX1eUxPwtkJWX886DkiBwdEgtUwDW8RJJCFU6+zjNwFZ8VcjeA7OCFKmZqoD8ABojMMtB53VoXXRzp5PtWgJEMpCLOhHbAA6nLR+Zu9zV8rFHsrjvR17ZgmA8q1dZRqqvZSyzsoP4KdW7f9nD2SjFEVhjHfIsQmwAAAIEAoDlEoGO/lc8XkvNW7G8/rybzETG0cepONVKThYufP5Z2FdGj9a1TYc2Gaw2DygM20Ohwj1RW8aeRE/jYbEm4unM6IFYeLvCbDeeCCHCiCJmw/Pj2ityB5uPTat4Yn28FCd4eP5LyQq2EHz6bPA0LzpNJKwto4naIMsDpET1GNH0=
 EOF
-cat >> ~/.bash_profile << EOF
-export SVN_SSH="ssh -l bcornec"
-export SVN_M=svn+ssh://bcornec@svn.berlios.de/svnroot/repos/mondorescue/
-export SVN_EDITOR=vim
-EOF
-source ~/.bash_profile
 
 rebuild paquets necessaires mondo:
@@ -85 +79 @@
 root:
 rpm -ivh ~bruno/RPMS/RPMS/i386/afio-[0-9]* ~bruno/RPMS/RPMS/i386/buffer-[0-9]*
+
+pour gentoo
+chown bruno /etc/make.conf
+bruno in portage group

branches/2.0.8/website/download.shtml

@@ -3 +3 @@
        burn it to a CD, and boot from it. It lets you test your RAM (with 
        memtest86) and your CPU (with cpuburn and lucifer). Feedback is welcome.</P>
-      <P ALIGN=JUSTIFY>
-       <B>Debian users</B> - click to download <A HREF="http://packages.debian.org/cgi-bin/search_packages2.pl?keywords=mondo&amp;searchon=names&amp;version=all&amp;release=all">Mondo</A> 
-       and <A HREF="http://packages.debian.org/cgi-bin/search_packages2.pl?keywords=mindi&amp;searchon=names&amp;version=all&amp;release=all">Mindi</A>...
-        and <A HREF="other/mindi-kernel-1.0.tgz">mindi-kernel</A> if your 
-       kernel blows. Much <A HREF="http://www.dictionary.com/search?q=kudos">kudos</A> 
-       is due to H&eacute;ctor Garc&iacute;a &Aacute;lvarez for rolling the 
-       DEBs. I am trying to create my own snapshot DEBs but I have not yet 
-       succeeded. Please be gentle with your criticism. :) My thanks go to 
-       Steve Hindle and Dagfinn Bakken for helping me with Debian.</P>
-           <A HREF="daily/unstable/changes">Monitas</A> (alpha-quality)</TD>
-         <TD WIDTH="25%" VALIGN=CENTER>
-          <P ALIGN=CENTER>
-           August/September</TD>
-         <TD WIDTH="15%" VALIGN=CENTER>
-          <P ALIGN=CENTER>
-           <A HREF="monitas/stefan/html/monitasconcepts.html">HTML docs</A></TD>
-         <TD WIDTH="15%" VALIGN=CENTER>
-          <P ALIGN=CENTER>
-           <A HREF="monitas/monitas.html">Download</A></TD>
-         <TD WIDTH="15%" VALIGN=CENTER>
-          <P ALIGN=CENTER>
-           <A HREF="monitas/stefan/monitasconcepts.pdf">PDF docs</A></TD>
-        </TR>
-       </TABLE></P>
-      </CENTER>

branches/2.0.8/website/downloads.shtml

@@ -22 +22 @@
     </div>
     <p>We are interested in up to date mirrors for both the Web and FTP sites. Please contact us on the <a href="/support.shtml">mailing list</a>.
+    <ul>
+        <li><b>Europe</b>:
+        <ul>
+            <li><i>France</i>:</li>
+            <ul>
+                <li>HP/Intel Solution Center :
+                    <a href="http://www.mondorescue.org">Web site</a>, 
+                    <a href="ftp://ftp.mondorescue.org">Ftp site</a>
+                </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>
+        </ul>
+    </ul>
 
     <div class="h2-3">

branches/2.0.8/website/news.shtml

@@ -62 +62 @@
 Release :-)
 </p><p>
-Now available at ftp://ftp.berlios.de/pub/mondorescue :<br>
+Now available at ftp://ftp.mondorescue.org :<br>
 <br>
 mandrake/10.1/mindi-1.06-266.10.1mdk.i386.rpm<br>
@@ -171 +171 @@
 version numbers of mondo and mindi to avoid confusion.
 </p><p>
-So I can now annouce the availability of the latest mondo and mindi
+So I can now announce the availability of the latest mondo and mindi
 which can be downloadable from http://mondorescue.berlios.de
 </p><p>