Changeset 2798 in MondoRescue for branches/2.2.8

Timestamp:

Apr 29, 2011, 3:38:21 PM (13 years ago)

Author:

Bruno Cornec

Message:

r2169@localhost (orig r2168): bruno | 2009-03-18 15:47:08 +0100

• Attempt to fix a bug with nosegneg optimized libs on RHEL, where some are still missing at restore time.

File:

• branches/2.2.8/mindi/mindi (modified) (1 diff)

branches/2.2.8/mindi/mindi

@@ -283 +283 @@
         vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
         echo "$vanilla_lib_name" >> $filelist
-        resolved=$vanilla_lib_name
-        echo "Adding $resolved to filelist" >> $LOGFILE
-        resolved=`ReadAllLink $resolved`
-        echo "Adding $resolved to filelist" >> $LOGFILE
+        echo "Adding $vanilla_lib_name to filelist" >> $LOGFILE
         mkdir -p $outdir$optimized_lib_name > /dev/null 2> /dev/null
         rmdir $outdir$optimized_lib_name > /dev/null 2> /dev/null
-        ln -sf $vanilla_lib_name $outdir$optimized_lib_name
-        echo "Excluding $optimized_lib_name" >> $LOGFILE
-        grep -Fvx "$optimized_lib_name" "$filelist" > $filelist.tmp
-        echo "Replacing it with $vanilla_lib_name" >> $LOGFILE
-        echo "$vanilla_lib_name" >> $filelist.tmp
-        mv -f $filelist.tmp $filelist
+
+        # This may return multiple files
+        for resolved in `ReadAllLink $vanilla_lib_name`; do
+            echo "Adding as deps $resolved to filelist" >> $LOGFILE
+            vanilla_resolved_name=`echo "$resolved" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
+            mkdir -p $outdir$resolved> /dev/null 2> /dev/null
+            rmdir $outdir$resolved > /dev/null 2> /dev/null
+            ln -sf $vanilla_resolved_name $outdir$resolved
+            echo "Excluding deps $resolved" >> $LOGFILE
+            grep -Fvx "$resolved" "$filelist" > $filelist.tmp
+            echo "Replacing it with $vanilla_resolved_name" >> $LOGFILE
+            echo "$vanilla_resolved_name" >> $filelist.tmp
+            mv -f $filelist.tmp $filelist
+        done
     done
     $AWK '{ print $1; }' $filelist | sort -u > $filelist.tmp