Changeset 903


Ignore:
Timestamp:
Oct 25, 2006, 1:49:52 AM (13 years ago)
Author:
bruno
Message:

merge -r862:888 $SVN_M/branches/stable

Location:
trunk
Files:
18 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/mindi-busybox/ChangeLog

    r832 r903  
    33MINDI-BUSYBOX CHANGES
    44
    5 1.2.1 (2006-09-23)
     51.2.1 (2006-10-04)
    66- Creation based on busybox 1.2.1 (Bruno Cornec)
     7- Remove module management, bunzip2 in config file (Bruno Cornec)
  • trunk/mindi-busybox/distributions/mandriva/spec.m4

    r833 r903  
    55dnl GRP is replaced by the RPM group of apps
    66define(`GRP', `Archiving/Backup')dnl
    7 dnl OBS is replaced with what is being obsoleted
    8 define(`OBS', `')dnl
     7dnl REQ is replaced with what is being required
     8define(`REQ', `Buildrequires: glibc-static-devel')dnl
  • trunk/mindi-busybox/distributions/redhat/spec.m4

    r833 r903  
    55dnl GRP is replaced by the RPM group of apps
    66define(`GRP', `Applications/Archiving')dnl
    7 dnl OBS is replaced with what is being obsoleted
    8 define(`OBS', )dnl
     7dnl REQ is replaced with what is being required
     8define(`REQ', )dnl
  • trunk/mindi-busybox/distributions/rpm/mindi-busybox.spec

    r863 r903  
    1111Source:     SSS
    1212BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
     13REQ
    1314ExcludeArch:    ppc
    1415Conflicts:  busybox
  • trunk/mindi-busybox/distributions/suse/spec.m4

    r833 r903  
    55dnl GRP is replaced by the RPM group of apps
    66define(`GRP', `Productivity/Archiving/Backup')dnl
    7 dnl OBS is replaced with what is being obsoleted
    8 define(`OBS', `')dnl
     7dnl REQ is replaced with what is being required
     8define(`REQ', `')dnl
  • trunk/mindi/ChangeLog

    r839 r903  
    33MINDI CHANGES
    44
    5 1.2.0 (2006-09-25)
    6 - busybox is now a separate package and binaries are not provided anymore in mindi (Bruno Cornec)
     51.2.0 (2006-10-04)
     6- busybox is now a separate package and binaries are not provided anymore in mindi - Fix #37 (Bruno Cornec)
     7- deplist.txt adapted to use more busybox modules (Bruno Cornec)
     8- start-nfs now exports variables taken from PXE command line to mondo to override parameters during archiving - Fix bug #21 (Bruno Cornec)
     9- Fix for bug #71 mindi now works correctly on x86_64 (Brendan Bouffler/Bruno Cornec)
     10- ReadAllLink function added to mindi and 3 older functions suppressed + use of readlink where useful (Bruno Cornec)
     11- Other fixes for labelled swap support (Michael Shapiro/Bruno Cornec)
     12- Fix for bug #4 (B. Baumer)
     13- Fix PXE documentation (Brendan Bouffler)
     14- Attempt to fix bug #25 - bonding support (Michael Shapiro/Bruno Cornec)
     15- Write start and finish time to log - Fix bug #33 (Bruno Cornec)
     16- Fix for bug #46 (Klaus Ade Johnstad)
    717
    8181.0.9 (2006-08-05)
     
    2333- Fix a bug in analyze-my-lvm for RHEL3 where vgdisplay prints an additional
    2434field sometimes (#) (severine.lombardo_at_acoss.fr/Bruno Cornec)
    25 - Deal properly with LVM tool lvmiopversion and with lvmcreate_initrd and pvdata - fixes Debian bug #351687 (Andree Leidenfrost)
    26 - Handle the format /dev/mapper/<VG>-<LV> for LVM devices - fix for Debian bug #362926 (Andree Leidenfrost)
     35- Deal properly with LVM tool lvmiopversion and with lvmcreate_initrd and pvdata - fixes [[debianBTS(351687)]] (Andree Leidenfrost)
     36- Handle the format /dev/mapper/<VG>-<LV> for LVM devices - fix for [[debianBTS(362926)]] (Andree Leidenfrost)
    2737
    28381.0.8-3 (2006-06-07)
     
    6070- CHANGES renamed also in install.sh now (Bruno Cornec)
    6171- rpmlint cleanups
    62 - Get mindi to look for analyze-my-lvm in it's library directory MINDI_LIB (See also Debian bug #351446.)
    63 - mindi only deletes freshly created 1440kb images in case of error (See also Debian Bug #348966.) (Andree Leidenfrost)
     72- Get mindi to look for analyze-my-lvm in it's library directory MINDI_LIB (See also [[debianBTS(351446)]].)
     73- mindi only deletes freshly created 1440kb images in case of error (See also [[debianBTS(348966)]].) (Andree Leidenfrost)
    6474- try standard grub-install in grub-MR restore script before trying anything fancy (Andree Leidenfrost)
    6575- busybox mount should be called with -o ro for PXE (Make RHEL 3 works in PXE with a 2.6 failsafe kernel now available) (Bruno Cornec)
  • trunk/mindi/deplist.txt

    r863 r903  
    2828devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
    2929
    30 insmod.static insmod.static.old
     30# For Debug  mode
     31# gdb
    3132
    3233#----------------- For all you LVM users out there, much love -----------------
  • trunk/mindi/mindi

    r863 r903  
    11931193    fi
    11941194    output=""
     1195    #for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /lib /lib64 /usr/local/lib /usr/local/lib64 /usr/X11R6/lib /usr/X11R6/lib64 `find /usr/lib64 /lib64 /usr/local/lib64 /usr/X11R6/lib64 -type d` ; do
    11951196    for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
    11961197        [ ! -d "$path" ] && continue
  • trunk/mindi/rootfs/sbin/MyInsmod

    r30 r903  
    44for i in insmod.static insmod busybox ; do
    55    if [ "$i" = "busybox" ] ; then
    6         $i insmod $*
     6        $i insmod $* 2> /dev/null
    77    else
    8         $i $*
     8        $i $* 2> /dev/null
    99    fi
    1010    res=$?
  • trunk/mindi/rootfs/sbin/init

    r764 r903  
    328328    fi
    329329
    330 }
    331 
    332 
    333 SwapTheMountExecs() {
    334     if [ -e "/bin/mount.libc5" ] ; then
    335         LogIt "Swapping busybox's mount with libc5 mount"
    336         mv /bin/mount /bin/mount.bb
    337         mv /bin/mount.libc5 /bin/mount
    338         sync
    339     fi
    340330}
    341331
     
    468458    ExtractDataDisksAndLoadModules
    469459elif [ "`grep -i pxe /proc/cmdline`" ]; then
    470     /sbin/start-nfs
     460    # We need to get here exported variables from start-nfs
     461    . /sbin/start-nfs
    471462
    472463    # Simulate a local CD
     
    477468    HandleCDROMorFloppies
    478469    ExtractDataDisksAndLoadModules
    479     /sbin/start-nfs
     470    # We need to get here exported variables from start-nfs
     471    . /sbin/start-nfs
    480472fi
    481473res=$?
    482 SwapTheMountExecs
    483474ConfigureLoggingDaemons
    484475if [ -e "/tmp/USE-DEVFS" ] ; then
  • trunk/mindi/rootfs/sbin/install-additional-tools

    r230 r903  
    11#!/bin/sh
    22#
    3 # 05/04/2003
    4 # - added missing 'res=0' to line 34
    5 # - replaced /mnt/groovy-stuff with $GROOVY
     3# $Id$
    64#
    7 # 07/17/2002
    8 # - delete dest files before moving src files there
    9 #
    10 # 07/11/2002
    11 # - move softlinks from /mnt/groovy-stuff to / afterward
    12 #
    13 # 03/21/2002
    14 # - added "PLEASE WAIT" when untarring/softlinking
    15 #
    16 # 02/18/2002
    175########################################################################
    186
     
    3826else
    3927    while [ "$diskno" -lt "20" ] ; do
    40     LogIt "PLEASE WAIT. Untarring and softlinking disk #$diskno" 2
    41     untar-and-softlink $diskno $mountdir /
    42     res=$(($res+$?))
    43     [ -e "/LAST-DISK" ] && diskno=999
    44     diskno=$(($diskno+1))
    45     [ -e "/tmp/CDROM-LIVES-HERE" ] && [ ! -f "/mnt/cdrom/images/$diskno.tar.gz" ] && break
     28        LogIt "PLEASE WAIT. Untarring and softlinking disk #$diskno" 2
     29        untar-and-softlink $diskno $mountdir /
     30        res=$(($res+$?))
     31        [ -e "/LAST-DISK" ] && diskno=999
     32        diskno=$(($diskno+1))
     33        [ -e "/tmp/CDROM-LIVES-HERE" ] && [ ! -f "/mnt/cdrom/images/$diskno.tar.gz" ] && break
    4634    done
    4735fi
     
    5947    sliceno=0
    6048    while [ "$sliceno" -le "999" ] ; do
    61     slicefile=$stub.
     49        slicefile=$stub.
    6250        [ "$sliceno" -lt "100" ] && slicefile="$slicefile"0
    63     [ "$sliceno" -lt "10" ]  && slicefile="$slicefile"0
    64     slicefile="$slicefile"$sliceno
    65     [ ! -e "$slicefile" ] && break
     51        [ "$sliceno" -lt "10" ]  && slicefile="$slicefile"0
     52        slicefile="$slicefile"$sliceno
     53        [ ! -e "$slicefile" ] && break
    6654#   echo "biggienumber=$biggienumber slicefile=$slicefile" >> /tmp/mondo-restore.log
    67     cat $slicefile >> /tmp/out.dat
    68     rm -f $slicefile
    69     sliceno=$(($sliceno+1))
    70     done
     55        cat $slicefile >> /tmp/out.dat
     56        rm -f $slicefile
     57        sliceno=$(($sliceno+1))
     58        done
    7159#    echo "$sliceno slices"
    7260
     
    9482for path in `find | grep -v /etc/fstab` ; do
    9583    if [ -d "$path" ] ; then
    96     mkdir /$path 2> /dev/null
     84        mkdir /$path 2> /dev/null
    9785    else
    9886# Patch from Andrew Bulhak
     
    10290        fi
    10391# end patch
    104     mv -f $path /$path
     92        mv -f $path /$path
    10593    fi
    10694done
    10795cp -f etc/fstab /tmp/fstab
     96tar cf - sbin bin usr/bin usr/sbin lib usr/lib lib64 usr/lib64 | (cd / ; tar xf -)
     97
    10898cd /
    109 
    110 
    111 # Was disabled in mid-March 2002 (?). Dunno why. Re-enabled July 11th, 2002.
    112 # BERLIOS: This doesn't work for symlink with new busybox in PXE mode
    113 #for path in /sbin /bin /usr/bin /usr/sbin /lib /usr/lib /lib/* /usr/lib/* ; do
    114     #[ ! -e "$path" ] && mkdir -p "$path"
    115     #for i in `ls $mountdir/$path 2> /dev/null` ; do
    116     #rm -f $path/$i 2> /dev/null
    117         #mv $mountdir/$path/$i $path 2> /dev/null
    118     #done   
    119 #done
    120 
    121 cd $mountdir
    122 tar cf - sbin bin usr/bin usr/sbin lib usr/lib | (cd / ; tar xf -)
    123 cd /
    124 
    12599
    126100for i in modprobe lsmod depmod rmmod ; do
  • trunk/mindi/rootfs/sbin/untar-and-softlink

    r30 r903  
    11#!/bin/sh
     2#
     3# $Id$
     4#
     5########################################################################
     6
    27
    38Die() {
     
    2025else
    2126    while [ ! -f "$tarball" ] ; do
    22     echo -e -n "Please insert data (floppy) disk #$diskno and press ENTER."
    23     read line
    24     mount /dev/fd0 -t ext2 -o ro $mountpoint
    25     [ -f "$tarball" ] || umount $mountpoint ; # unmount if tarball not on disk
    26     echo -en "Working..."
     27        echo -e -n "Please insert data (floppy) disk #$diskno and press ENTER."
     28        read line
     29        mount /dev/fd0 -t ext2 -o ro $mountpoint
     30        [ -f "$tarball" ] || umount $mountpoint ; # unmount if tarball not on disk
     31        echo -en "Working..."
    2732    done
    2833fi
  • trunk/mindi/rootfs/sbin/wait-for-petris

    r378 r903  
    66# Say what we are doing
    77echo -n "Waiting for petris"
    8 # Get the right linker for architecture
    9 arch=`uname -m`
    10 case $arch in
    11   'ia64')
    12     linker="/lib/ld-linux-ia64.so.2" ;;
    13   'x86_64')
    14     linker="/lib/ld-linux-x86-64.so.2" ;;
    15   *)
    16     # we only run on the above two and IA32, so this must be it
    17     linker="/lib/ld-linux.so.2" ;;
    18 esac
    19 # First wait for the libraries to become available...
    20 while   [ ! -f /lib/libncurses.so.5 -o ! -f /lib/libc.so.6 -o ! -f "$linker" ] ; do
     8# Wait for the libraries to become available...
     9while   [ ! -f /lib/libncurses.so.5 ] ; do
    2110  echo -n "."
    22   sleep 1
     11  sleep 2
    2312done
     13sleep 2
    2414# ...then wait for petris
    2515which petris > /dev/null
     
    3020done
    3121# Keep running petris until it's killed or crashes
    32 while [ $? -eq 0 ] ; do
     22while [ 0 -eq 0 ] ; do
    3323    clear
    3424    sleep 1
  • trunk/mondo/ChangeLog

    r794 r903  
    88- Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task)
    99
    10 2.2.0 (2006-09-05)
     102.2.0 (2006-10-04)
     11- start-nfs now exports variables taken from PXE command line to mondo to override parameters during archiving - Fix bug #21 (Bruno Cornec)
     12- Fix for bug #71 mondo now works correctly on x86_64 (Brendan Bouffler/Bruno Cornec)
     13- Fix for bug #4 (B. Baumer)
     14- Fix PXE documentation (Brendan Bouffler)
     15- Attempt to fix bug #25 - bonding support (Michael Shapiro/Bruno Cornec)
     16- Write start and finish time to log - Fix bug #33 (Bruno Cornec)
     17- New mr_stresc function to escape commands submitted to system and fixes [[debianBTS(379966)]] (Andree Leidenfrost)
     18- New files mr_string.c and mr_string.h (v3.0 new organization) (Andree Leidenfrost)
     19- Fix for [[debianBTS(320152)]] display problem in newt (Andree Leidenfrost)
     20- Check for grub.conf being a symbolic link (Andree Leidenfrost)
     21- AFS support (Andree Leidenfrost/Bruno Cornec)
     22- Better post-nuke handling (first steps) (Andree Leidenfrost)
     23- Icon for use in menus (Andree Leidenfrost)
     24- Fix for bug #14 -E switch error (Bruno Cornec)
     25- Fix for bug #6 mondorestore will ask for prefix during selectve restore (Bruno Cornec)
     26- Fix for bug #21 prefix taken from PXE server first (Bruno Cornec)
     27- Fix for bug #24 ps options (Bruno Cornec)
     28>>>>>>> .merge-right.r888
    1129
    12302.0.9 (2006-08-04)
     
    2240- nfsmount option added to allow redeployment from another NFS server (Bruno Cornec)
    2341- This version should work a bit better with files having special char bug #7421 - but more to come (Bruno Cornec)
    24 - Fix Debian Bug #369321 by increasing MAX_TAPECATALOG_ENTRIES to 8192 and bkpinfo->optimal_set_size to 16MB (Andree Leidenfrost)
     42- Fix [[debianBTS(369321)]] by increasing MAX_TAPECATALOG_ENTRIES to 8192 and bkpinfo->optimal_set_size to 16MB (Andree Leidenfrost)
    2543- Fix problem with BurnProof+DVD (Andree Leidenfrost)
    2644- Fix bug #7820: mondo should now support files > 2GB (taps23_at_yahoo.com/Bruno Cornec)
    2745- Replaced all occurrences of egrep with 'grep -E' and of fgrep with 'grep -F' (Andree Leidenfrost)
    28 - Optimize grep usage - fixes Debian bug #222052 (Andree Leidenfrost)
     46- Optimize grep usage - fixes [[debianBTS(222052)]] (Andree Leidenfrost)
    2947- Avoid false alerts about growisofs not running under sudo (Andree Leidenfrost)
    3048- Increase PPCFG_RAMDISK_SIZE to 350 MB (Thomas Börkel/Bruno Cornec)
     
    6886- files > 2GB are now really supported (Andree Leidenfrost)
    6987- new SGML based Mondo Rescue documentation + new Web site (Bruno Cornec/Andree Leidenfrost)
    70 - mondoarchive aborts when 'mindi --findkernel' gives a fatal error (See also Debian bug #352323.) (Andree Leidenfrost)
     88- mondoarchive aborts when 'mindi --findkernel' gives a fatal error (See also [[debianBTS(352323)]].) (Andree Leidenfrost)
    7189- /tmp not excluded anymore from backup (Bruno Cornec)
    7290- New RPM Build environement (Bruno Cornec)
  • trunk/mondo/src/common/libmondo-devices.c

    r900 r903  
    15781578            if (bkpinfo->media_device != NULL) {
    15791579                mr_asprintf(&tmp,
    1580                         _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."),
     1580                        _("I think I've found your %s burner at SCSI node %s; Is this correct ? (say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details."),
    15811581                        bkpinfo->backup_media_string,
    15821582                        bkpinfo->media_device);
  • trunk/mondo/src/common/libmondo-files.c

    r900 r903  
    11091109        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
    11101110        mr_asprintf(&command,
    1111                 "ifconfig %s | awk '{print $5}'", nfs_dev);
     1111                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
    11121112        mac_addr = call_program_and_get_last_line_of_output(command);
    11131113        mr_asprintf(&command,
    1114                 "ifconfig | grep -E '%s' | head -n1  | cut -d' ' -f1", mac_addr);
     1114                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1  | cut -d' ' -f1", mac_addr);
    11151115        mr_free(nfs_dev);
    11161116        nfs_dev = call_program_and_get_last_line_of_output(command);
  • trunk/mondo/src/mondorestore/mondo-rstr-tools.c

    r900 r903  
    793793    char *tmp = NULL;
    794794    char *tmp1 = NULL;
     795    char *envtmp1 = NULL;
     796    char *envtmp2 = NULL;
    795797    char *command = NULL;
    796798    char *iso_mnt = NULL;
     
    854856            /* We need to override prefix value in PXE mode as it's
    855857             * already done in start-nfs */
     858            envtmp1 = getenv("imgname");
     859            if (envtmp1 == NULL) {
     860                fatal_error("no imgname variable in environment");
     861            }
    856862            if (strstr(call_program_and_get_last_line_of_output
    857863               ("cat /proc/cmdline"), "pxe")) {
    858                     strcpy(bkpinfo->prefix,getenv("imgname"));
     864                    mr_allocstr(bkpinfo->prefix,envtmp1);
    859865            }
    860866
     
    985991        /* We need to override values in PXE mode as it's
    986992         * already done in start-nfs */
     993        envtmp1 = getenv("nfsmount");
     994        if (envtmp1 == NULL) {
     995            fatal_error("no nfsmount variable in environment");
     996            }
     997        envtmp2 = getenv("dirimg");
     998        if (envtmp2 == NULL) {
     999            fatal_error("no dirimg variable in environment");
     1000        }
    9871001        if (strstr(call_program_and_get_last_line_of_output
    9881002           ("cat /proc/cmdline"), "pxe")) {
    989                 strcpy(bkpinfo->nfs_mount,getenv("nfsmount"));
    990                 strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));
    991             }
     1003                mr_allocstr(bkpinfo->nfs_mount,envtmp1);
     1004                mr_allocstr(bkpinfo->nfs_remote_dir,envtmp2);
     1005        }
    9921006    } else if (bkpinfo->backup_media_type == iso) {
    9931007        /* Patch by Conor Daly 23-june-2004
Note: See TracChangeset for help on using the changeset viewer.