Changeset 1784 in MondoRescue

Timestamp:

Nov 10, 2007, 11:47:07 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fix mindi for Debian x86_64 where /lib64 is a link

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (3 diffs)
• mindi/mindi-bkphw (modified) (3 diffs)
• mondo/src/common/libmondo-fork.c (modified) (1 diff)
• mondo/src/mondoarchive/main.c (modified) (1 diff)
• mondo/src/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-restore-EXT.h (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -1017 +1017 @@
 }
 
-
+#
+# Critical function which computes all dependencies (dyn. lib.) 
+# for a list of binaries
+#
 LocateDeps() {
     local incoming fname deps
@@ -1057 +1060 @@
     fi
     if [ -h "$d" ]; then
-        echo "$link $d"
+        echo "$link"
+        echo "$d"
     else
         echo "$link"
@@ -2406 +2410 @@
 
 ProcessLDD() {
-    local incoming f
+    local incoming f d nd bd bnd
     read incoming
-    while [ "$incoming" != "" ] ; do
+    while [ "$incoming" != "" ]; do
         # We take the full path name of the dyn. lib. we want
         incoming=`echo "$incoming" | awk '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
         for f in $incoming ; do
+            # echo modified file name if one of the parent dir is a link
+            # by replacing the original dirname by the destination of the link
+            d="`dirname $f`"
+            found="false"
+            while [ "$d" != "/" ]; do
+                if [ -h "$d" ]; then
+                    nd=`readlink -f $d`
+                    bd=`basename $d`
+                    bnd=`basename $nd`
+                    f=`echo $f | sed "s~/$bd/~/$bnd/~"`
+                    echo $d
+                fi
+                d="`dirname $d`"
+            done
+
             echo "$f"
             echo "`ReadAllLink $f`"

branches/2.2.5/mindi/mindi-bkphw

@@ -20 +20 @@
 
 mkdir $bkpdir,0755 if (! -d $bkpdir) ;
-open(SYSTEM,"dmidecode -s 'system-product-name' |") || die "You need dmidecode for mindi hardware support";
+open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' |") || die "You need /usr/sbin/dmidecode for mindi hardware support";
 my $productname = <SYSTEM>;
 close(SYSTEM);
@@ -26 +26 @@
 chomp($productname);
 if ($productname =~ /proliant/i) {
-    print "Detected an HP Hardware. Nice. Continue to support my job :-)\n";
+    print "Detected an HP Proliant Server. Nice. Continue to support my job :-)\n";
     print "Activating Proliant support for mindi\n";
     open(PROLIANT,"$confdir/proliant.files") || die "Unable to open $confdir/proliant.files";
@@ -79 +79 @@
 } else {
     print "No Hardware support for $productname\n";
-    print "Ask your manufacturer to contribute to the mindi project\n";
+    print "You may ask your manufacturer to contribute to the mindi project\n";
 }
 rmdir $bkpdir if (-d $bkpdir) ;

branches/2.2.5/mondo/src/common/libmondo-fork.c

@@ -114 +114 @@
 //static char cvsid[] = "$Id$";
 
-extern char *g_tmpfs_mountpt;
 extern t_bkptype g_backup_media_type;
 extern bool g_text_mode;

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -131 +131 @@
 extern char *g_boot_mountpt;
 extern bool g_remount_floppy_at_end;
-extern char *g_tmpfs_mountpt;
 extern char *g_cdrw_drive_is_here;
 static char *g_cdrom_drive_is_here = NULL;

branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c

@@ -173 +173 @@
 extern bool g_skip_floppies;    ///< Whether to skip the creation of boot disks
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
-extern char g_tmpfs_mountpt[MAX_STR_LEN];
 extern bool g_sigpipe;
 

branches/2.2.5/mondo/src/mondorestore/mondo-restore-EXT.h

@@ -8 +8 @@
 extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;
-extern char *g_tmpfs_mountpt;
 extern char *g_isodir_device;
 extern char *g_isodir_format;