Changeset 3662 in MondoRescue

Timestamp:

May 3, 2017, 11:27:13 AM (8 years ago)

Author:

Bruno Cornec

Message:

Remove useless code from CopyFromConf

File:

• branches/3.3/mindi/mindi (modified) (3 diffs)

branches/3.3/mindi/mindi

@@ -623 +623 @@
             filelist=`GenerateListForFile "$incoming"`
             for tool in $filelist ; do
-                lvmresolved=`readlink -f $tool`
-                if [ "$tool" = "$lvmresolved" ]; then
-                    echo "$tool" >> $tempfile
-                elif echo "$lvmresolved" | grep "lvmiopversion" &> /dev/null ; then
-                    if [ "$lvmversion" = "" ] ; then
-                        lvmversion=`$lvmresolved`
-                        echo "$lvmresolved" >> $tempfile
-                    fi
-                    toolstripped=`echo $tool | $AWK -F / '{print $NF;}'`
-                    if [ "$lvmversion" = "200" ]; then
-                        # pvdata and lvmcreate_initrd don't exist in LVM2
-                        case "$toolstripped" in
-                        "pvdata")
+            lvmresolved=`readlink -f $tool`
+            if [ "$tool" = "$lvmresolved" ]; then
+                echo "$tool" >> $tempfile
+            elif echo "$lvmresolved" | grep "lvmiopversion" &> /dev/null ; then
+                if [ "$lvmversion" = "" ] ; then
+                    lvmversion=`$lvmresolved`
+                    echo "$lvmresolved" >> $tempfile
+                fi
+                toolstripped=`echo $tool | $AWK -F / '{print $NF;}'`
+                if [ "$lvmversion" = "200" ]; then
+                    # pvdata and lvmcreate_initrd don't exist in LVM2
+                    case "$toolstripped" in
+                    "pvdata")
                             continue
                             ;;
-                        "lvmcreate_initrd")
+                    "lvmcreate_initrd")
                             continue
                             ;;
                         esac
-                    fi
-                    toolpath="/sbin/lvm-"$lvmversion"/"$toolstripped
-                    if [ -e "$toolpath" ] ; then
+                fi
+                toolpath="/sbin/lvm-"$lvmversion"/"$toolstripped
+                if [ -e "$toolpath" ] ; then
                         echo "$toolpath" >> $tempfile
                         echo "$tool" >> $tempfile
-                    else
+                else
                         toolpath="/lib/lvm-"$lvmversion"/"$toolstripped
-                    fi
-                    if [ -e "$toolpath" ] ; then
-                        echo "$toolpath" >> $tempfile
-                        echo "$tool" >> $tempfile
-                    else
-                        echo "Where are your LVM-Tools? Couldn't find $tool"
-                    fi
+                fi
+                if [ -e "$toolpath" ] ; then
+                    echo "$toolpath" >> $tempfile
+                    echo "$tool" >> $tempfile
+                else
+                    echo "Where are your LVM-Tools? Couldn't find $tool"
+                fi
                 else
                     echo "$tool" >> $tempfile
@@ -2644 +2644 @@
     done
     echo -e "$DONE"
-    echo -en "INFO: Processing all dependencies links..."
-    # And their deps
-    lines=`sort -u $MINDI_TMP/$conf.lis $MINDI_TMP/$conf2.lis2`
-    noof_lines=`echo $lines | wc -w`
-    progress=0
-    for f in $lines; do
-        mr-read-all-link $f >> $MINDI_TMP/$conf.lis
-        if [ "`echo $f | cut -c1`" = "/" ]; then
-            j=`echo $f | cut -c2-`
-            [ "$j" != "" ] && rm -f $mountpoint/$j
-        fi
-        progress=$(($progress+1))
-        LogProgress $progress $noof_line
-    done
-    echo -e "$DONE"
+    echo "INFO: Processing all dependencies links for $conf.conf..."
+    # And their deps except dirs
+    lines=`sort -u $MINDI_TMP/$conf.lis $MINDI_TMP/$conf.lis2`
+    rm -f $MINDI_TMP/$conf.lis2
     finallist=""
-    # Remove directories from the list, as tar/cp will create them anyway
+    # Remove directories from the list, as cp will create them anyway
     # and it may hurt if /lib is in it as on Debian/Ubuntu
     # recent bash says that -d is true for a link to a dir !
-    for f in `sort -u $MINDI_TMP/$conf.lis`; do
+    for f in $lines; do
+    #for f in `sort -u $MINDI_TMP/$conf.lis`; do
         if [ -e "$f" -a ! -d "$f" ] || [ -h "$f" ]; then
             # Do not overwrite files already in destination (avoid using option -n of cp not portable)
@@ -2675 +2665 @@
     LogFile "INFO: Copying $conf related files with cp -a --parents $fnllist $lis3 -t $mountpoint/"
     cp -a --parents $fnllist $lis3 -t $mountpoint/ 2> $templog  || LogAll "WARNING: Problem in $conf analysis" $templog
-    rm -f $MINDI_TMP/$conf.lis $MINDI_TMP/$conf.lis2
+    rm -f $MINDI_TMP/$conf.lis
 }