Changeset 2599 in MondoRescue

Timestamp:

Mar 17, 2010, 3:55:47 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3743@localhost: bruno | 2010-03-16 01:44:07 +0100

• Improve log results for mindi by avoiding useless ops
• Fix a bug on Mandriva modules analysis (at least)

File:

• branches/2.2.10/mindi/mindi (modified) (4 diffs)

branches/2.2.10/mindi/mindi

@@ -303 +303 @@
             LogFile "Adding as deps $resolved to filelist" 
             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
-            LogFile "Excluding deps $resolved" 
-            grep -Fvx "$resolved" "$filelist" > $filelist.tmp
-            LogFile "Replacing it with $vanilla_resolved_name" 
-            echo "$vanilla_resolved_name" >> $filelist.tmp
-            mv -f $filelist.tmp $filelist
+            if [ "$vanilla_resolved_name" != "$resolved" ]; then
+                mkdir -p $outdir$resolved> /dev/null 2> /dev/null
+                rmdir $outdir$resolved > /dev/null 2> /dev/null
+                ln -sf $vanilla_resolved_name $outdir$resolved
+                LogFile "Excluding deps $resolved" 
+                grep -Fvx "$resolved" "$filelist" > $filelist.tmp
+                LogFile "Replacing it with $vanilla_resolved_name" 
+                echo "$vanilla_resolved_name" >> $filelist.tmp
+                mv -f $filelist.tmp $filelist
+            fi
         done
         progress=$(($progress+1))
@@ -440 +442 @@
     fi
     # Find all files and links (required for some VMWare VMs)
-    modpaths=`find $1 -name $2.*o -type f -o -type l`
-    [ "$modpaths" = "" ] && modpaths=`find $1 -name $2.o.gz -type f -o -type l`
-    [ "$modpaths" = "" ] && modpaths=`find $1 -name $2.ko.gz -type f -o -type l`
-    [ "$modpaths" = "" ] && modpaths=`find $1 -name $2 -type f -o -type l`
+    modpaths=`find $1 -name $2.*o -o -name $2.o.gz -o -name $2.ko.gz -o -name $2 -type f -o -type l`
     echo "$modpaths"
 }
@@ -2229 +2228 @@
     done
 
-    for i in $needed_modules ; do
-        [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
-        LogFile "Adding $i ($s KB) to the rootfs" 
-        echo $i >> $MINDI_TMP/cp.lis
+    for i in `echo $needed_modules  | tr ' ' '\n' | sort -u`; do
+        grep -qE '^$i$' $MINDI_TMP/cp.lis
+        if [ $? != 0 ]; then
+            [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
+            LogFile "Adding $i ($s KB) to the rootfs" 
+            echo $i >> $MINDI_TMP/cp.lis
+        fi
     done
 
@@ -2244 +2246 @@
     cat $MINDI_CACHE/mountlist.txt >> $LOGFILE
     LogFile "-----------------------------------"
-
-    if [ ! -e "/sbin/devfsd" ] ; then
-        LogFile "Deleting devfsd daemon from ramdisk because /sbin/devfsd not found" 
-        echo ./sbin/devfsd >> $MINDI_TMP/rm.lis
-    fi
 
     cd $old_pwd