Changeset 1770 in MondoRescue for branches/stable/pbconf

Nov 6, 2007, 11:01:53 AM (14 years ago)
Bruno Cornec
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod? silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian? keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René? Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

2 deleted
7 edited
7 copied


  • branches/stable/pbconf/mindi-busybox/rpm/mindi-busybox.spec

    r1674 r1770  
    30 make PREFIX=$DESTDIR install
     30make CONFIG_PREFIX=$DESTDIR install
    37 %doc ChangeLog INSTALL LICENSE AUTHORS README TODO changelog svn.log
  • branches/stable/pbconf/mindi/deb/rules

    r1674 r1770  
    11 # PREFIX for installtion
     11# PREFIX for installation
     12export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME)
    1213export PREFIX=/usr
     14export CONFDIR=/etc
     15export MANDIR=$(PREFIX)/share/man
     16#export DOCDIR=$(PREFIX)/share/doc
     17export LIBDIR=$(PREFIX)/lib
     18export CACHEDIR=/var/cache/$(PACKAGE_NAME)
     19export PKGBUILDMINDI=true
    2936    dh_installdirs
    3037    # Build the installation tree:
    31     (export PKGBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && export CACHEDIR=/var/cache/$(PACKAGE_NAME) && ./ )
     38    ./
    3340# Build architecture-independent files here.
  • branches/stable/pbconf/mindi/rpm/mindi.spec

    r1693 r1770  
    5151%config(noreplace) %{_sysconfdir}/%{name}
    52 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
     52%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox README.proliant README.bkphw svn.log
  • branches/stable/pbconf/mondo/ebuild/mondo-rescue.ebuild

    r1591 r1770  
    4040    elibtoolize
    4141    econf || die "Configuration failed"
    42     emake VERSION=VVV || die "Make failed"
     42    emake VERSION=PBVER || die "Make failed"
  • branches/stable/pbconf/mondo/pbinit

    r1619 r1770  
    66# Export documentation to generate what is needed
    7 use ProjectBuilder::Base qw (pb_cms_init pb_cms_export pb_mkdir_p);
     7use ProjectBuilder::Base qw (pb_cms_init pb_cms_export pb_mkdir_p pb_filter_file);
     8use File::Basename;
     16my $pbpkg = "PBPKG";
     17my $pbver = "PBVER";
     18my $pbtag = "PBTAG";
     19my $pbrev = "PBREV";
    1321my $cms = pb_cms_init($ENV{'PBPROJ'},undef);
    15 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondoarchive.8","docs/man");
    16 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorestore.8","docs/man");
    19 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.sgml","docs/en");
    2230# should call filter_file here
    23 system("cd docs/en ; ls -lR > /tmp/1 ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");
     32my $ptr = pb_get_filters($pbpkg);
     33foreach my $f (<docs/mantmp/*>) {
     34    pb_filter_file("$f",$ptr,"docs/man/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
     36foreach my $f (<docs/entmp/*>) {
     37    pb_filter_file("$f",$ptr,"docs/en/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
     42system("cd docs/en ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");
  • branches/stable/pbconf/mondorescue.pb

    r1693 r1770  
    99projtag mondorescue = 1
     12# Which CMS system is used
     14cms mondorescue = svn
     17# Packager label
     19packager mondorescue = "Bruno Cornec <>"
     22# For delivery to a machine by SSH (potentially the FTP server)
     23# Needs hostname, account and directory
     25sshhost mondorescue =
     26sshlogin mondorescue = bruno
     27sshdir mondorescue = /mondo/ftp
     28sshport mondorescue = 22
     31# For Virtual machines management
     32# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution)
     33# followed by '_' and by release number
     34# a .vmtype extension will be added to the resulting string
     35# a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
     37vmlist mondorescue = mandrake_10.1,mandrake_10.2,mandriva_2006.0,mandriva_2007.0,mandriva_2007.1,mandriva_2008.0,redhat_7.3,redhat_9,fedora_4,fedora_5,fedora_6,fedora_7,rhel_2.1,rhel_3,rhel_4,rhel_5,suse_10.0,suse_10.1,suse_10.2,suse_10.3,sles_9,sles_10,debian_3.1,debian_4.0,ubuntu_6.06,ubuntu_7.04,ubuntu_7.10,gentoo_nover,slackware_10.2,slackware_11.0,freebsd_5.5
     40# Valid values for vmtype are
     41# qemu, (vmware, xen, ... TBD)
     42vmtype mondorescue = qemu
     43vmntp mondorescue =
     45# We suppose we can commmunicate with the VM through SSH
     46vmhost mondorescue = localhost
     47vmlogin mondorescue = pb
     48vmport mondorescue = 2222
     49# Timeout to wait when VM is launched/stopped
     50vmtmout default = 120
     51vmsize mondorescue = 5G
     53# per VMs needed paramaters
     54#vmopt mondorescue = -m 256 -nographic -daemonize
     55vmopt mondorescue = -m 384 -daemonize
     56vmpath mondorescue = /users/qemu
    1159# Hash of default package/package directory
    1260defpkgdir mondo = mondo
    1361defpkgdir mindi = mindi
    15 pkgver mindi = 1.2.5
     63pkgver mindi = 2.0.0
    1664pkgver mindi-busybox = 1.7.2
    17 pkgtag mindi-busybox = 1
     65#pkgtag mindi-busybox = 2
    1967# Hash of additional package/package directory
    20 extpkgdir mindi-busybox = mindi
     68extpkgdir mindi-busybox = mindi-busybox
    2169extpkgdir mondo-doc = mondo-doc
    2876# Files are mentioned relatively to pbroot
    2977filteredfiles mondo =
    30 filteredfiles mondo-doc = mondorescue-howto.sgml,mondoarchive.8,mondorestore.8
     78filteredfiles mondo-doc = mondorescue-howto.sgml,mondoarchive.8,mondorestore.8,mindi.8
    3179filteredfiles mindi = rootfs/sbin/init,mindi,
     80filteredfiles mindi-busybox = Makefile
    3281filteredfiles mondo-website = top.shtml
  • branches/stable/pbconf/pbfilter/rpm.pbf

    r1672 r1770  
    44# Filter for rpm build
    6 # PBSRC is replaced by the source package format
    7 filter PBSRC ={name}-%{version}.tar.gz
    97# PBGRP is replaced by the RPM group of apps
    1311filter PBDEP =
    15 # PBVER is replaced by the version ($pbver in code)
    16 filter PBVER = $pbver
    18 # PBDATE is replaced by the date ($pbdate in code)
    19 filter PBDATE = $pbdate
    21 # PBLOG is replaced by the changelog if value is yes
    22 filter PBLOG = yes
    24 # PBTAG is replaced by the tag ($pbtag in code)
    25 filter PBTAG = $pbtag
    27 # PBREV is replaced by the revision ($pbrev in code)
    28 filter PBREV = $pbrev
    30 # PBPKG is replaced by the package name ($pbpkg in code)
    31 filter PBPKG = $pbpkg
    3313# PBSUF is replaced by the package name ($pbpkg in code)
    3414filter PBSUF = $pbsuf
Note: See TracChangeset for help on using the changeset viewer.