Changeset 588 in MondoRescue for trunk/mindi

Timestamp:

May 29, 2006, 11:47:20 AM (18 years ago)

Author:

bcornec

Message:

merge -r 560:587 $SVN_M/branches/stable

Location:

trunk/mindi

Files:

• ChangeLog (modified) (1 diff)
• README.ia64 (modified) (1 diff)
• README.pxe (modified) (1 diff)
• aux-tools/sbin (modified) (1 prop)
• aux-tools/usr (modified) (1 prop)
• aux-tools/usr/share (modified) (1 prop)
• aux-tools/usr/share/terminfo (modified) (1 prop)
• aux-tools/usr/share/terminfo/l (modified) (1 prop)
• distributions/debian/changelog (copied) (copied from branches/stable/mindi/distributions/debian/changelog )
• distributions/debian/compat (copied) (copied from branches/stable/mindi/distributions/debian/compat )
• distributions/debian/control (copied) (copied from branches/stable/mindi/distributions/debian/control )
• distributions/debian/copyright (copied) (copied from branches/stable/mindi/distributions/debian/copyright )
• distributions/debian/dirs (copied) (copied from branches/stable/mindi/distributions/debian/dirs )
• distributions/debian/docs (copied) (copied from branches/stable/mindi/distributions/debian/docs )
• distributions/debian/rules (copied) (copied from branches/stable/mindi/distributions/debian/rules )
• distributions/gentoo/mindi.ebuild (modified) (1 diff)
• distributions/rpm/mindi.spec (modified) (2 diffs)
• install.sh (modified) (1 diff)
• mindi (modified) (9 diffs)
• parted2fdisk.pl (modified) (1 diff)
• rootfs/bin (modified) (1 prop)
• rootfs/dev (modified) (1 prop)
• rootfs/etc (modified) (1 prop)
• rootfs/lib (modified) (1 prop)
• rootfs/proc (modified) (1 prop)
• rootfs/root (modified) (1 prop)
• rootfs/sbin (modified) (1 prop)
• rootfs/sbin/init (modified) (1 diff)
• rootfs/tmp (modified) (1 prop)
• rootfs/usr (modified) (1 prop)
• rootfs/usr/X11R6 (modified) (1 prop)
• rootfs/usr/X11R6/bin (modified) (1 prop)
• rootfs/usr/X11R6/lib (modified) (1 prop)
• rootfs/usr/bin (modified) (1 prop)
• rootfs/usr/lib (modified) (1 prop)
• rootfs/usr/local (modified) (1 prop)
• rootfs/usr/local/bin (modified) (1 prop)
• rootfs/usr/local/sbin (modified) (1 prop)
• rootfs/usr/sbin (modified) (1 prop)
• rootfs/usr/share (modified) (1 prop)
• rootfs/usr/share/udhcpc (modified) (1 prop)
• rootfs/usr/share/udhcpc/default.script (modified) (1 prop)
• rootfs/var (modified) (1 prop)
• rootfs/var/log (modified) (1 prop)
• rootfs/var/run (modified) (1 prop)

trunk/mindi/ChangeLog

@@ -3 +3 @@
 MINDI CHANGES
 
-1.07 ()
+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)
+- Fix issue for 2.6 kernels with VIA chipsets (Andree Leidenfrost)
 - stop creating further size of floppy disks if the smaller one succeeds 
   (Bruno Cornec)

trunk/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.
 

trunk/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

trunk/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$
-# $Header$
 
 DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."

trunk/mindi/distributions/rpm/mindi.spec

@@ -52 +52 @@
 
 %files
-%defattr(644,root,root,755)
 %config(noreplace) %{_sysconfdir}/mindi
 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt 
@@ -60 +59 @@
 %{_mandir}/man8/*
 %{_libdir}/mindi
-%attr(755,root,root) %{_sysconfdir}/mindi/mindi.conf
-%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/*
+%{_sysconfdir}/mindi/mindi.conf
+%{_sbindir}/*
 
 %changelog

trunk/mindi/install.sh

@@ -118 +118 @@
 fi
 
+# Special case for Debian family where doc is put elsewhere in the DEB
+if [ _"$dfam" = _"debian" ]; then
+    rm -rf $DOCDIR
+fi
+
 exit 0

trunk/mindi/mindi

@@ -510 +510 @@
     if [ "$?" -ne "0" ] ; then
     umount $mountpoint
-    Die "Tarball $tarball is too big for disk! (CODI)\nTell dev team to adjust MAX_COMPRESSED_SIZE"
+    Die "Tarball $tarball is too big for disk! (CODI)\nTell Dev Team to adjust MAX_COMPRESSED_SIZE"
     fi
     [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
@@ -757 +757 @@
     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`
@@ -1274 +1274 @@
     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
 ###
@@ -1291 +1291 @@
 ### Sq-Modification end
 ###
-    searchpath=/lib/modules/$kver
+        searchpath=/lib/modules/$kver
     fi
     
@@ -2785 +2785 @@
     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.
@@ -2795 +2795 @@
         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
 ###
@@ -2805 +2805 @@
     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 cdrom isocd isofs `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     else
         list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
@@ -2820 +2820 @@
     [ -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
@@ -2899 +2899 @@
     while [ "$diskno" -le "$noof_disks" ] ; do
         cd $minidir_root/$diskno || LogIt "Warning - cannot cd to $minidir_root/$diskno\n"
-        tar -cf - . 2>> $LOGFILE | gzip -9 > $tardir/$diskno.tar.gz || Die "Can't tar/gzip disk#$diskno; please tell dev team -exactly- what the errors where."
+        tar -cf - . 2>> $LOGFILE | gzip -9 > $tardir/$diskno.tar.gz || Die "Can't tar/gzip disk#$diskno; please tell Dev Team -exactly- what the errors where."
         diskno=$(($diskno+1))
         echo -n "..."

trunk/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)

trunk/mindi/rootfs/sbin/init

@@ -566 +566 @@
 {
     echo "********************************************************************"
-    echo "MINDI-LINUX by Hugo Rabson --- web site: http://www.mondorescue.org"
+    echo "MINDI-LINUX by Mondo Dev Team - web site: http://www.mondorescue.org"
     echo "Boot disk based on AlfaLinux & Trinux. BusyBox by Erik Andersen."
 which petris > /dev/null 2> /dev/null && echo "Petris was written by Peter Seidler <p.seidler@mail1.stofanet.dk>."