Changeset 426

Timestamp:

02/23/06 16:09:24 (4 years ago)

Author:

bcornec

Message:

merge -r421:425 $SVN_M/branches/stable

Files:

• trunk/mindi/distributions/mandriva/changelog (copied) (copied from branches/stable/mindi/distributions/mandriva/changelog)
• trunk/mindi/distributions/mandriva/perlfilter (copied) (copied from branches/stable/mindi/distributions/mandriva/perlfilter)
• trunk/mindi/distributions/rpm/mindi.spec (modified) (4 diffs)
• trunk/mindi/mindi (modified) (4 diffs)
• trunk/mindi/rootfs/proc/.keep (modified) (1 diff)
• trunk/mindi/rootfs/tmp/mondo-restore.cfg (modified) (1 diff)
• trunk/mindi/rootfs/var/log/wtmp (modified) (1 diff)
• trunk/mindi/rootfs/var/run/utmp (modified) (1 diff)
• trunk/mondo/Makefile.am (modified) (1 diff)
• trunk/mondo/configure.in (modified) (3 diffs)
• trunk/mondo/distributions/mandriva/changelog (copied) (copied from branches/stable/mondo/distributions/mandriva/changelog)
• trunk/mondo/distributions/mandriva/perlfilter (copied) (copied from branches/stable/mondo/distributions/mandriva/perlfilter)
• trunk/mondo/distributions/rpm/mondo.spec (modified) (6 diffs)
• trunk/mondo/mondo/Makefile.am (modified) (1 diff)
• trunk/mondo/mondo/common/Makefile.am (modified) (2 diffs)
• trunk/mondo/mondo/common/libmondo-archive.c (modified) (1 diff)
• trunk/mondo/mondo/common/libmondo-tools.c (modified) (1 diff)
• trunk/mondo/mondo/common/my-stuff.h (modified) (1 diff)
• trunk/mondo/mondo/mondoarchive/Makefile.am (modified) (1 diff)
• trunk/mondo/mondo/mondoarchive/main.c (modified) (1 diff)
• trunk/mondo/mondo/mondorestore/Makefile.am (modified) (1 diff)
• trunk/mondo/mondo/mondorestore/mondo-restore-EXT.h (modified) (1 diff)
• trunk/mondo/mondo/mondorestore/mondo-restore.c (modified) (2 diffs)
• trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• trunk/mondo/mondo/mondorestore/mondo-rstr-tools.h (modified) (1 diff)
• trunk/mondo/mondo/post-nuke.sample/usr/bin/Makefile.am (modified) (1 diff)
• trunk/mondo/mondo/restore-scripts/Makefile.am (modified) (1 diff)
• trunk/mondo/mondo/restore-scripts/mondo/Makefile.am (modified) (1 diff)
• trunk/mondo/mondo/restore-scripts/usr.bin/Makefile.am (modified) (1 diff)
• trunk/tools/mkcommon (modified) (1 diff)
• trunk/tools/mkrpm (modified) (2 diffs)
• trunk/website/download.shtml (modified) (1 diff)
• trunk/website/downloads.shtml (modified) (1 diff)
• trunk/website/images/mondo.png (copied) (copied from branches/stable/website/images/mondo.png)

trunk/mindi/distributions/rpm/mindi.spec

@@ -9 +9 @@
-%define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools
-%define addreq  DDD
-
-
-
-
-
-
-
-
+
-
-Summary:    Mindi creates emergency boot disks/CDs using your kernel, tools and modules
@@ -37 +30 @@
-verify packages, etc.
-
-%debug_package
-%prep
-%{__rm}  -rf $RPM_BUILD_ROOT
@@ -62 +54 @@
-
-%post
-for i in %{_libdir}/mindi/aux-tools/sbin/* %{_libdir}/mindi/rootfs/bin/* %{_libdir}/mindi/rootfs/sbin/* ; do
-    if [ ! -h $i ]; then
-        %{__chmod} 755 $i
-    fi
-done
-if [ -f /usr/local/sbin/mindi ]; then
-    echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"
@@ -75 +62 @@
-%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
-%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
-
+/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/*
-
-%changelog
-* Fri Feb 16 2006 Bruno Cornec <bcornec@users.berlios.de> 1.0.7
-- Updated to 1.0.7
-- RPMS spec are now generated instead of using '%' variables
-
-* Fri Nov 05 2005 Bruno Cornec <bcornec@users.berlios.de> 1.05
-- ia64 is now working
-- use install.sh script
-- use libdir for binary data
-
-* Tue Sep 06 2005 Bruno Cornec <bcornec@users.berlios.de> 1.04_berlios
-- Merge of patches mentionned on mondo ML + ia64 updates
-- Fix bugs when called alone
-
-* Tue May 03 2005 Hugo Rabson <hugorabson@msn.com> 1.04_cvs_20050503
-- supports exec-shield
-
-* Wed Aug 04 2004 Hugo Rabson <hugorabson@msn.com> 1.03
-- better support of SLES 8
-
-* Mon Jun 28 2004 Hugo Rabson <hugorabson@msn.com> 1.02
-- better kernel-level logging
-- added ACL, xattr binaries to deplist.txt
-- fixed obscure bug which occasionally stopped mindi from correctly finding
-  and documenting all LVM2 LVM-on-RAID volumes
-
-* Fri Jun 25 2004 Hugo Rabson <hugorabson@msn.com> 1.01
-- added ide_tape and other modules to mindi's config detection
-- unmount errant ramdisk ($mtpt) if fail to create boot floppy
-- better support of ISO dirs at restore-time (Conor Daly)
-
-* Fri Jun 18 2004 Hugo Rabson <hugorabson@msn.com> 1.00
-- first 1.0x release
-- busybox now static
-- trap Ctrl-Alt-Del; trigger soft reset
-- better SuSE 9.1 support
-- added parted2fdisk.pl (IA64) (Bruno Cornec)
-- add LVM2 support for kernel 2.6 (Takeru Komoriya)
-- better detection of multiple Mindis (Martin FÃŒrstenau)
-- don't complain if just a Mindi boot CD & not a platform for Mondo
-- updated busybox to 1.0.0pre10
-- removed uClibc
-- add memtest support
-- 2.6 kernel support
-- removed Embleer files (Andree Leidenfrost)
-- added kernel-only floppy support, to accommodate really big kernels
-- updated+rebuilt busybox
-- added star support
-- mount /sys at boot-time
-- better 64-bit and 2.6 kernel support
-- better LVM, failsafe kernel support (Jim Richard)
-- use LILO, not raw kernel, on 1.4MB boot floppy 
-- record names of unsaved modules, for future reference
-- enlarged ramdisk by 8MB
-
-* Wed Oct 22 2003 Hugo Rabson <hugorabson@msn.com> 0.95
-- changed some '==' to '=' --- now more RH6-friendly
-- allow absolute pathnames again in deplist
-- disable multifunc cd thing
-- better Gentoo support (Bill)
-- better OnStream support
-- better Slackware support (Laurenz)
-- added partimagehack-static to deplist.txt
-- recompiled Busybox - now 10k smaller; better stack-handling
-- fixed boot screen typo
-- added support for 'auto' fs format
-- better devfs support for Mandrake users
-- better Debian+LVM support (Ralph Grewe)
-- updated analyze-my-lvm to handle floating-point gigabyte -L values
-
-* Thu Jul 24 2003 Anonymous <root@rohan> 0.94
-- altered rootfs's /dev entry to stop cvs from becoming confused
-- tweaked MAX_COMPRESSED_SIZE
-- added multi-function CD support to mindi and sbin/post-init
-- re-mount root as rw just in case
-- ask user to remove last data (floppy) disk if nec. (Tom Mortell)
-- added support for 5th column in mountlist.txt for labels
-- added symlinks.tgz
-- suppress erroneous error msgs re: failsafe kernel
- 
-* Sun May 18 2003 Hugo Rabson <hugorabson@msn.com> 0.93
-- added cciss.o to SCSI_MODS
-- if format type is (e.g.) ext3,ext2 then use 1st entry
-- re-enabled fsck*
-- if cciss in use the enable it at boot-time
-- added /dev/ataraid/* to boot disk via ataraid.tgz (Luc S.)
-- better ISO support
-- tweaked Mindi to use 10-15% fewer floppies
-- added RUN_AFTER_INITIAL_BOOT_PHASE to let user specify a command
-  to be run by Mindi before it bootstraps to aux data disks;
-  e.g. 'echo engage > /proc/scsi/something'
-- added RUN_AFTER_BOOT_PHASE_COMPLETE to let user specify a command
-  to be run by Mindi after it boots but before it runs mondorestore
-- allow for Debian & other Stiefkinder that use 'none', not 'swap'
-  as the mountpoint of the swap partition
-- removed afio dependency
-- re-worked install.sh and tarball not to use tgz's
-- cleared up the boot msg
-- updated busybox to 0.60.5; updated uClibc to 0.9.19
-- add #!/bin/sh to start of insert-all-my-modules
-- fixed obscure bug in install-additional-tools
-- changed grep -m to grep | head -n1 for Debian users
-- moved vmlinuz, lib.tar.bz2 to mindi-kernel tarball/rpm
-
-* Wed Apr 09 2003 Hugo Rabson <hugorabson@msn.com> 0.92
-- fixed LVM/RAID bugs (Brian Borgeson)
-- if bad lilo, give more verbose error before quitting
-- added mt and perl to deplist.txt
-- insist on gawk being present
-- insmod ide-cd, cdrom, isofs, just in case
-- boot-time tmpfs ramdisk is now 40m (was 34m)
-- cleaned up logs
-- iso mode now calls Interactive
-- make SizeOfPartition() more Debian-friendly (Andree Leidenfrost)
-- clean up some calls to grep, esp. partition_mountpt=...
-- corrected some bashisms, to suit Debian ped- er, users
-- made first line refer to bash, not sh, to make sure 
-  the Debian people know Mindi requires bash, not hs
-- changed grep -v "#" and grep -vx "#.*" to grep -vx " *#.*"
-- disabled code which would have made Mindi use sfdisk instead of fdisk
-  if it looked as if Debian's fdisk would misbehave
-
-* Wed Feb 12 2003 Hugo Rabson <hugorabson@msn.com> 0.91
-- new devel branch
-- EXTRA_SPACE=16384
-- updated ResolveSoftlinks() to work better with b0rkn Gentoo devfs /dev
-- patched analyze-my-lvm (Benjamin Mampaey)
-- detect built-in boot.b files in lilo
-- cleaned up spec file a bit, more use of macros (Jesse Keating)
-- return w/err, don't abort, if Matt Nelson's RH8 system is farked
-- better at finding isolinux.bin
-- better at analyzing dependencies when running on broken distributions
-- try harder to boot from CD, even if tape fails
-- added ADDITIONAL_BOOT_PARAMS to be sent to kernel
-- better resolution of relative softlinks, leading to fewer
-  duplicates on data disks and therefore fewer data disks
-- detect Debian+devfs; use sfdisk instead of fdisk in that
-  eventuality, to work around yet another of Debian's warts
-- removed /lib/libuuid.* from rootfs.tgz
-- fixed vi
-- mindi now uses gawk --traditional (making gawk behave in a functionally
-  identical way to awk) - PASS; great, so now Debian needs to fix its awk :)
-- removed / from list of dirs accessed when trying to resolve deplist entry
-- spinner bugfix; handle odd LABELs properly (Tom Mortell)
-- fixed LVM/RAID bugs (Brian Borgeson)
-
-* Mon Dec 02 2002 Hugo Rabson <hugo@firstlinux.net> 0.72_20021202
-- misc code clean-up
-- save boot device's boot sector
-- detect and beware Compaq diagnostic partitions
-- better handling of devfs V non-devfs kernels and boot devs
-- trimmed busybox 0.60.3 binary on boot disk
-- mindi now resides in /usr/local/bin
-- removed lilo from dependencies
-- more Gentoo-friendly
-
-* Sun Nov 18 2002 Hugo Rabson <hugo@firstlinux.net> 0.71
-- if your kernel's builddate doesn't match any of the kernels in 
-  your /boot directory then fudge the issue & find the closest 
-  match (*grumble* Debian)
-- scan tape & CD at start, to force inclusion of modules on boot device
-- double EXTRA_SPACE if >7 disks
-- slimmer, more lithesome logfile
-- now accepts --findkernel
-- line 1982 - dd count=24000 should be count=$ramdisksize (Andras Korn)
-- better handling of non-Linux partitions on DevFS-enabled kernels
-- misc clean-ups
-- fixed Debian/ramdisksize/bloat problem (Johannes Franken)
-- fixed 2.4.20/fdisk eccentricity (Alistair Stevens)
-- updated kernel to 2.4.18-mdk6
-- generate mountlist in dev-abetical order ;)
-- fixed minor bug in .spec file
-- better at finding /boot/boot.b if your distro breaks the de facto standard
-- fixed minor bug in MakeMountlist
-- fixed install.sh
-- cleaned up deplist.txt
-- added rudimentary -v / --version flag
-- line 1180 or so --- duplicate mindi.iso entries --- fixed
-- added /bin/[ - a softlink to /bin/sh
-- ListAllPartitions() - sanity fix (KP)
-- fixed .spec bug
-- better feedback
-- added Markus's RAID patch
-- ListAllPartitions() - include /mnt/win* (Hugo)
-
-* Sun Sep 08 2002 Hugo Rabson <hugo@firstlinux.net> 0.70
-- better logging by dependency-calculating code
-- better handling of dependencies, specifically softlinks
-- if called by mondo then use mondo's temp dir as our temp dir too
-- changed gawk to $AWK in a few places, to allow for Debian
-- added host* config files to deplist
-- added tftp, ifconfig to busybox
-- added RPC support to uClibc
-- cleaned up creation of Mondo-Mindi configuration file
-- fixed bug in TryToFindKernelPath which stopped it from handling
-  multiple, same-version kernels gracefully
-- cleaned up deplist.txt
-- receive 'DIFFERENTIAL' variable from Mondo
-- better Debian compatibility, esp. w/detection of ver# (Hector Alvarez)
-- better devfs support; call fgrep in places instead of grep (Andrew Korn)
-- fixed analyze-my-lvm (Ralph Gruwe)
-- moved 50K of stuff from rootfs.tgz to aux-tools.tgz
-- added x11-tools.tgz option
-- updated /dev/console and /dev/tty0 (Paul Stevens)
-- cleaned up /mnt/groovy-stuff V /tmp/tmpfs code
-- catch sigint, sighup, etc.
-- fixed LILO-related message.txt mistake
-- .spec file clean-up; automation; config file (Carl Wilhem Soderstrom)
-- better devfs support (Andrew Korn)
-
-* Sun Jul 14 2002 Hugo Rabson <hugo@firstlinux.net> 0.64-1
-- fixed RH7.3 readonly bug
-- improved nfs config file creation
-- search more locations for isolinux.bin
-- added isonuke option
-- faster data disk creation
-- better DevFS support (Hector Alvarez, DuckX)
-- nfs-related fix (Hans Lie)
-- abort if vfat filesystem present but mkfs.vfat missing
-- removed softlink to pico
-- allow Mondo to say no compression will be used
-- added [ to ramdisk
-- tar data disks with -b [block size] of 32k
-- don't autoboot to 'RESTORE' screen - it's scary!
-- let user choose lilo or syslinux as boot loader
-- added syslinux support
-- cleaned up message screens
-

trunk/mindi/mindi

@@ -628 +628 @@
-    [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
-    echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
-LIB = $MONDO_LIB
+SHARE = $MONDO_SHARE
-    mkdir -p $CACHE_LOC
-}
@@ -1613 +1613 @@
-        cp -f $TMP_ROOT/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
-    fi
-LIB" ] && cp -f $MONDO_LIB
+SHARE" ] && cp -f $MONDO_SHARE
-    if [ -d "/home/MondoCD" ] ; then
-    cp -pRdu /home/MondoCD/* .
@@ -2196 +2196 @@
-    tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
-    fi
-LIB
-LIB
-LIB
+SHARE
+SHARE
+SHARE
-    fi
-    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .
@@ -2811 +2811 @@
-        [ "$USE_LZO" = "yes" ] && echo -en "Pras 4 Pres 2004" >> $mountpoint/tmp/USING-LZO
-        [ "$USE_COMP" = "yes" ] && echo -en "Compression, yep" >> $mountpoint/tmp/USING-COMP
-[ "$USE_STAR" = "yes" ] && echo =
+   [ "$USE_STAR" = "yes" ] && echo -
-    fi
-    mkdir -p $mountpoint/tmp

trunk/mindi/rootfs/proc/.keep

@@ +1 @@
+ 

trunk/mindi/rootfs/tmp/mondo-restore.cfg

@@ +1 @@
+ 

trunk/mindi/rootfs/var/log/wtmp

@@ +1 @@
+ 

trunk/mindi/rootfs/var/run/utmp

@@ +1 @@
+ 

trunk/mondo/Makefile.am

@@ -1 +1 @@
-AUTOMAKE_OPTIONS = 1.7
-
-
+     
+     

trunk/mondo/configure.in

@@ -21 +21 @@
-AM_MAINTAINER_MODE
-
-AM_PROG_LIBTOOL
-AC_PROG_CXX
-AC_PROG_AWK
-AC_PROG_CC
+AC_PROG_RANLIB
-AC_PROG_CPP
-AC_PROG_INSTALL
@@ -49 +49 @@
-
-# Checks for libraries.
-
+dnl 
-AC_CHECK_LIB([newt], [newtInit])
-standardthread=0;
@@ -105 +105 @@
-AC_SUBST(LIBS)
-
-dnl AC_FIND_BZIP2
-
-# Checks for header files.
-AC_HEADER_STDC

trunk/mondo/distributions/rpm/mondo.spec

@@ -11 +11 @@
-%define grp     GRP
-%define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
+%define rel     %{mrel}
-
-Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
@@ -19 +20 @@
-Name:       %{name}
-Version:    %{version}
-m
+
-License:    GPL
-Group:      %{grp}
@@ -33 +34 @@
-
-%description
-
+
+
+
-
-%description -l fr
-Objectif
-""""""""
-
+
+
+
+
-
-%description -l it
@@ -55 +61 @@
-con cintas y NFS, tambien.
-
-%debug_package
-%prep
-%setup -q -n %name-%{version}
@@ -70 +75 @@
-%endif
-
-%post
-/sbin/ldconfig
-%{__chmod} 755 %{_libdir}/%{name}/restore-scripts/%{name}/*
-
-%postun
-/sbin/ldconfig
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
@@ -87 +85 @@
-
-%attr(755,root,root) %{_sbindir}/*
-
-
-
+
+
+
+
+
-
-%changelog
-* Fri Feb 17 2006 Bruno Cornec <bcornec@users.berlios.de> 2.0.7
-- Updated to 2.0.7
-- RPM sepc files are now generated
-
-* Fri Nov 05 2005 Bruno Cornec <bcornec@users.berlios.de> 1.05
-- ia64 is now working
-- -p option related bug fixed
-- use libdir instead of datadir
-
-* Tue Sep 06 2005 Bruno Cornec <bcornec@users.berlios.de> 2.04_berlios
-- Merge of patches mentionned on mondo ML + ia64 updates
-- 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
-
-* Fri 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
-
-* Fri 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
-
-* Mon 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
-
-
-
-

trunk/mondo/mondo/Makefile.am

@@ -1 +1 @@
-SUBDIRS        = common mondoarchive mondorestore restore-scripts post-nuke.sample
-common mondoarchive mondorestore restore-scripts post-nuke.sample
+${SUBDIRS}
-
-lib_DATA   = do-not-compress-these
+data_DATA   = do-not-compress-these autorun

trunk/mondo/mondo/common/Makefile.am

@@ -2 +2 @@
-## Process this file with Automake to generate `Makefile.in'
-##
+AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\"
-
-
-
+
+
-
-
+
+
+
+
+
+
-                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
-                       libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
@@ -12 +18 @@
-                       libmondo-verify.h libmondo-fifo.h \
-                       libmondo-archive-EXT.h my-stuff.h mondostructures.h \
-
-
-
-
+
+
+
+
+
+
-                       newt-specific.h
-
-## Libraries
-lib_LTLIBRARIES      = libmondo.la libmondo-newt.la
-
-## libmondo
-libmondo_la_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       libmondo-mountlist.c libmondo-raid.c \
-                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c
-libmondo_la_LDFLAGS  = -version-info 2:3:0 -shrext .so
-libmondo_la_LIBADD   = @LIBS@
-
-## libmondo-newt
-libmondo_newt_la_SOURCES = newt-specific.c
-libmondo_newt_la_LDFLAGS = -version-info 1:0:0 -shrext .so
-libmondo_newt_la_LIBADD  = -lnewt

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

@@ -3750 +3750 @@
-/* @} - end of utilityGroup */
-
-lib
-
-LIB", MONDO_LIB
+share
+
+SHARE", MONDO_SHARE
-}

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

@@ -190 +190 @@
-    char *home_sz = NULL;
-
-LIB
+SHARE
-    return (home_sz);
-}

trunk/mondo/mondo/common/my-stuff.h

@@ -395 +395 @@
-#define MNT_FLOPPY "/mnt/floppy"
-
-#define FREELOADER              // You're not a paying customer
-#define DEFAULT_MR_LOGLEVEL 4
-

trunk/mondo/mondo/mondoarchive/Makefile.am

@@ -9 +9 @@
-sbin_PROGRAMS        = mondoarchive
-mondoarchive_SOURCES = main.c mondo-cli.c
-
-
-
-
+

trunk/mondo/mondo/mondoarchive/main.c

@@ -171 +171 @@
-    setenv("ARCH", get_architecture(), 1);
-
-LIB
-lib
+SHARE
+share
-
-    unlink(MONDO_LOGFILE);

trunk/mondo/mondo/mondorestore/Makefile.am

@@ -12 +12 @@
-mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
-                        mondo-rstr-compare.c mondo-rstr-tools.c
-../common/libmondo.la ../common/libmondo-newt.l
+${top_builddir}/mondo/common/libmondo.

trunk/mondo/mondo/mondorestore/mondo-restore-EXT.h

@@ -72 +72 @@
-extern void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool);
-extern void sort_mountlist_by_device(struct mountlist_itself *);
-extern void success_message(void);
-extern void twenty_seconds_til_yikes(void);
-extern int run_raw_mbr(bool offer_to_hack_scripts, char *bd);

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

@@ -392 +392 @@
-#endif
-
-extern void success_message(void);
-extern void twenty_seconds_til_yikes(void);
-
@@ -1226 +1225 @@
-            ("PC was restored successfully. Thank you for using Mondo Rescue.");
-        log_to_screen
-http://www.mondorescue.org and thank the dev team
+our website at http://www.mondorescue.org for more information
-    } else {
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-    g_I_have_just_nuked = TRUE;

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -2060 +2060 @@
-
-
-
-
-
-
-/**
- * Prompt the user to support the Mondo project.
- */
-void success_message(void)
-{
-    int i;
-    /* malloc and ptr */
-    char *tmp;
-
-    malloc_string(tmp);
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "restore") == NULL) {
-        if (ask_me_yes_or_no
-            ("Have you contributed to the Mondo project financially or in some other way, yet?"))
-        {
-            log_to_screen
-                ("Thank you for supporting Mondo. It goes from strength to strength,");
-            log_to_screen("thanks to the support of users like you.");
-        } else {
-            if (ask_me_yes_or_no
-                ("Are you or your company willing to consider contributing to Mondo in some way?"))
-            {
-                popup_and_OK
-                    ("To support the project which has just performed a valuable service for you, please visit http://www.mondorescue.com; click on 'Download' and then 'PayPal'.");
-            } else {
-                log_to_screen
-                    ("Free Software, like freedom itself, must be supported or it will be lost.");
-                log_msg(1,
-                        "To your credit, you were honest: you said no, you wouldn't be contributing");
-                log_msg(1,
-                        "to this project, ever. However, that makes you a freeloader. I bet you're");
-                log_msg(1,
-                        "the sort of person who likes to sneak into movie theatres...");
-                popup_and_OK
-                    ("If you ever change your mind, you may support this product by going to http://www.mondrescue.com and clicking on 'Download', followed by 'PalPal'.");
-            }
-        }
-    }
-#ifdef FREELOADER
-    i = (int) (random()) % 32;
-#else
-    i = 1;
-#endif
-
-    if (i != 25) {
-        strcpy(tmp,
-               "Mondo has restored your system. Please remove the backup media and reboot.");
-    } else {
-        strcpy(tmp,
-               "M0nd0 h45 r3570r3d j00r 5y573m. P13453 r3m0v3 7h3 b4ckup m3d14 4nd r3b007.");
-    }
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "restore") == NULL) {
-        popup_and_OK(tmp);
-    }
-    log_to_screen(tmp);
-    paranoid_free(tmp);
-}
-
-/**************************************************************************
- *END_SUCCESS_MESSAGE                                                     *
- **************************************************************************/
-
-
-
-/**
- * Exit due to a signal (normal cleanup).

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

@@ -27 +27 @@
-void setup_global_filenames(struct s_bkpinfo *bkpinfo);
-//void setup_signals(int);
-void success_message(void);
-void twenty_seconds_til_yikes(void);
-int run_raw_mbr(bool offer_to_hack_scripts, char *bd);

trunk/mondo/mondo/post-nuke.sample/usr/bin/Makefile.am

@@ -1 @@
-lib
+data
-postnukeusrbin_SCRIPTS = post-nuke

trunk/mondo/mondo/restore-scripts/Makefile.am

@@ -1 +1 @@
-SUBDIRS = mondo usr
-
-lib
+data
-restoreetc_DATA     = etc/multipath.conf.sample etc/raid0.conf.sample \
-                      etc/raid1.conf.sample etc/raid4.conf.sample \

trunk/mondo/mondo/restore-scripts/mondo/Makefile.am

@@ -1 @@
-lib
+data
-restoremondo_SCRIPTS = ISO ask-me-a-question compare-me compare-subroutine-me \
-                       edit-mountlist grub-MR hack-fstab hack-grub hack-lilo hack-elilo \

trunk/mondo/mondo/restore-scripts/usr.bin/Makefile.am

@@ -1 @@
-lib
+data
-#restoreusrbin_SCRIPTS = # petris pico nano

trunk/tools/mkcommon

@@ -55 +55 @@
-    svn export ${VER}/mondo mondo-${MONDO_VER}
-    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
-    mkdir -p mondo-${MONDO_VER}/docs/man
-    cp -a ${VER}/documentation/mondo*.8 mondo-${MONDO_VER}/docs/man
-    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
-    rm -rf documentation-${MONDO_VER}

trunk/tools/mkrpm

@@ -29 +29 @@
-    mkdir -p ${TOPDIR}/SOURCES 
-    $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
-
+
+
+
+
-fi
-if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
-    cd ${BASE}/svn
-    $TOOLHOME/mkspec ${MINDI_VER} mindi-${MINDI_VER}/distributions/rpm/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
+    cat mindi-${MINDI_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mindi.spec
+    chmod 644 ${TOPDIR}/SPECS/mindi.spec
-    rm -rf mindi-${MINDI_VER}/distributions
-    mkdir -p ${TOPDIR}/SOURCES 
-
-
+
+
+
-    # ATTENTION: This could be dangerous for your setup
-    opt="rm -rf /usr/lib/mindi ;"
@@ -44 +51 @@
-    cd ${BASE}/svn
-    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
+    cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo.spec
+    chmod 644 ${TOPDIR}/SPECS/mondo.spec
-    rm -rf mondo-${MONDO_VER}/distributions
-
-
+
+
+
-fi
-

trunk/website/download.shtml

@@ -1 @@
-       <B><A HREF="isos/mondo-install-cd.iso">NEW! Installer CD</A></B> - if 
-       you have the time or bandwidth, please try this CD (image). It is 
-       updated on Sundays and Mondays.</P>
-      <P ALIGN=JUSTIFY>
-       <B><A HREF="isos/mindi.iso">Test CD</A></B> - if you think your 
-       hardware is faulty, please download <A HREF="mindi.iso">this ISO</A>, 

trunk/website/downloads.shtml

@@ -50 +50 @@
-      <h2>Downloads</h2>
-    </div>
+    <p>Mondo's FTP site is available at <a href="ftp://ftp.mondorescue.org">ftp://ftp.mondorescue.org</a></p>
-<h3>Source code</h3>
-<ul>
-
+s are
-    <li>Subversion browing available at <a href="http://svn.berlios.de/viewcvs/mondorescue">http://svn.berlios.de/viewcvs/mondorescue</a></li>
-    <li>Anonymous HTTP Subversion check out of the project available with the following instruction set: <pre><tt>svn checkout http://svn.berlios.de/svnroot/repos/mondorescue/branches/stable</tt></pre></li>