Changeset 1784 for branches/2.2.5


Ignore:
Timestamp:
Nov 10, 2007, 11:47:07 PM (12 years ago)
Author:
bruno
Message:

Fix mindi for Debian x86_64 where /lib64 is a link

Location:
branches/2.2.5
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1781 r1784  
    10171017}
    10181018
    1019 
     1019#
     1020# Critical function which computes all dependencies (dyn. lib.)
     1021# for a list of binaries
     1022#
    10201023LocateDeps() {
    10211024    local incoming fname deps
     
    10571060    fi
    10581061    if [ -h "$d" ]; then
    1059         echo "$link $d"
     1062        echo "$link"
     1063        echo "$d"
    10601064    else
    10611065        echo "$link"
     
    24062410
    24072411ProcessLDD() {
    2408     local incoming f
     2412    local incoming f d nd bd bnd
    24092413    read incoming
    2410     while [ "$incoming" != "" ] ; do
     2414    while [ "$incoming" != "" ]; do
    24112415        # We take the full path name of the dyn. lib. we want
    24122416        incoming=`echo "$incoming" | awk '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
    24132417        for f in $incoming ; do
     2418            # echo modified file name if one of the parent dir is a link
     2419            # by replacing the original dirname by the destination of the link
     2420            d="`dirname $f`"
     2421            found="false"
     2422            while [ "$d" != "/" ]; do
     2423                if [ -h "$d" ]; then
     2424                    nd=`readlink -f $d`
     2425                    bd=`basename $d`
     2426                    bnd=`basename $nd`
     2427                    f=`echo $f | sed "s~/$bd/~/$bnd/~"`
     2428                    echo $d
     2429                fi
     2430                d="`dirname $d`"
     2431            done
     2432
    24142433            echo "$f"
    24152434            echo "`ReadAllLink $f`"
  • branches/2.2.5/mindi/mindi-bkphw

    r1782 r1784  
    2020
    2121mkdir $bkpdir,0755 if (! -d $bkpdir) ;
    22 open(SYSTEM,"dmidecode -s 'system-product-name' |") || die "You need dmidecode for mindi hardware support";
     22open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' |") || die "You need /usr/sbin/dmidecode for mindi hardware support";
    2323my $productname = <SYSTEM>;
    2424close(SYSTEM);
     
    2626chomp($productname);
    2727if ($productname =~ /proliant/i) {
    28     print "Detected an HP Hardware. Nice. Continue to support my job :-)\n";
     28    print "Detected an HP Proliant Server. Nice. Continue to support my job :-)\n";
    2929    print "Activating Proliant support for mindi\n";
    3030    open(PROLIANT,"$confdir/proliant.files") || die "Unable to open $confdir/proliant.files";
     
    7979} else {
    8080    print "No Hardware support for $productname\n";
    81     print "Ask your manufacturer to contribute to the mindi project\n";
     81    print "You may ask your manufacturer to contribute to the mindi project\n";
    8282}
    8383rmdir $bkpdir if (-d $bkpdir) ;
  • branches/2.2.5/mondo/src/common/libmondo-fork.c

    r1745 r1784  
    114114//static char cvsid[] = "$Id$";
    115115
    116 extern char *g_tmpfs_mountpt;
    117116extern t_bkptype g_backup_media_type;
    118117extern bool g_text_mode;
  • branches/2.2.5/mondo/src/mondoarchive/main.c

    r1747 r1784  
    131131extern char *g_boot_mountpt;
    132132extern bool g_remount_floppy_at_end;
    133 extern char *g_tmpfs_mountpt;
    134133extern char *g_cdrw_drive_is_here;
    135134static char *g_cdrom_drive_is_here = NULL;
  • branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c

    r1767 r1784  
    173173extern bool g_skip_floppies;    ///< Whether to skip the creation of boot disks
    174174extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
    175 extern char g_tmpfs_mountpt[MAX_STR_LEN];
    176175extern bool g_sigpipe;
    177176
  • branches/2.2.5/mondo/src/mondorestore/mondo-restore-EXT.h

    r1647 r1784  
    88extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
    99extern bool g_I_have_just_nuked;
    10 extern char *g_tmpfs_mountpt;
    1110extern char *g_isodir_device;
    1211extern char *g_isodir_format;
Note: See TracChangeset for help on using the changeset viewer.