Changeset 3660 in MondoRescue

Timestamp:

May 3, 2017, 11:27:10 AM (7 years ago)

Author:

Bruno Cornec

Message:

Mutualize code in CopyFromConf to reuse

File:

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

branches/3.3/mindi/mindi

@@ -2617 +2617 @@
 }
 
+CopyFromConf() {
+
+    conf=$1
+    echo -en "INFO: Gathering dependencies of $conf.conf..."
+    lis2=`grep -Ev '^#' $DEPLIST_DIR/$conf.conf | sort -u`
+    noof_lines=`echo $lis2 | wc -w`
+    progress=0
+    lis=""
+    # Get only the files which exist in that list
+    # and potentially their symlink structure
+    for f in $lis2; do
+        if [ -d $f ]; then
+            for g in `find $f`; do 
+                echo $g >> $MINDI_TMP/$conf.lis
+                LocateDeps $g  >> $MINDI_TMP/$conf.lis2
+            done
+            lis3="$lis3 $f"
+        else 
+            if [ -r $f ]; then
+                echo $f >> $MINDI_TMP/$conf.lis
+                LocateDeps $f >> $MINDI_TMP/$conf.lis2
+            fi
+        fi
+        progress=$(($progress+1))
+        LogProgress $progress $noof_lines
+    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"
+    finallist=""
+    # Remove directories from the list, as tar/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
+        if [ -e "$f" -a ! -d "$f" ] || [ -h "$f" ]; then
+            # Do not overwrite files already in destination (avoid using option -n of cp not portable)
+            if [ ! -e "$mountpoint/$f" ]; then
+                finallist="$finallist $f"
+            fi
+        fi
+    done
+    # But adds the directory useful in $lis3
+    fnllist=`echo $finallist | tr ' ' '\n' | sort -u | tr '\n' ' '`
+    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
+}
 
 MakeBootInitFile() {
@@ -2698 +2758 @@
 
     # Copy of files from the minimal env needed as per the deplist.d/minimal.conf (which includes all busybox deps)
-    echo -en "INFO: Gathering dependencies of required files..."
-    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
-    lines=`cat $DEPLIST_DIR/minimal.conf | grep -vE " *#.*|^#" | sort -u`
-    noof_lines=`echo $lines | wc -w`
-    progress=0
-    for f in $lines; do
-        if [ -d $f ]; then
-            for g in `find $f`; do 
-                echo $g >> $MINDI_TMP/minimal.lis
-                LocateDeps $g  >> $MINDI_TMP/minimal2.lis
-            done
-        else 
-            if [ -r $f ]; then
-                echo $f >> $MINDI_TMP/minimal.lis
-                LocateDeps $f >> $MINDI_TMP/minimal2.lis
-            fi
-        fi
-        progress=$(($progress+1))
-        LogProgress $progress $noof_lines
-    done
-    echo -e "$DONE"
-    echo -en "INFO: Processing all dependencies links..."
-    lines=`sort -u $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis`
-    noof_lines=`echo $lines | tr ' ' '\n' | wc -l`
-    progress=0
-    for f in $lines; do
-        mr-read-all-link $f >> $MINDI_TMP/minimal.lis
-        progress=$(($progress+1))
-        LogProgress $progress $noof_lines
-    done
-    echo -e "$DONE"
-    # Initial / are trucated by tar
-    finallist=""
-    # Remove directories from the list, as tar/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/minimal.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)
-            if [ ! -e "$mountpoint/$f" ]; then
-                finallist="$finallist $f"
-            fi
-        fi
-    done
-    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
-
-    fnllist=`echo $finallist | tr ' ' '\n' | sort -u | tr '\n' ' '`
-    LogFile "INFO: Copy the minimal env with cp -a --parents $fnllist -t $mountpoint"
-    cp -a --parents $fnllist -t $mountpoint 2> $templog || LogAll "WARNING: Problem in minimal analysis" $templog
+    CopyFromConf minimal
 
     # In case target /bin dir still doesn't exist, create it before using it
@@ -2787 +2799 @@
         fi
         if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
-            lis2=`grep -Ev '^#' $DEPLIST_DIR/udev.conf`
-            lis=""
-            # Get only the files which exist in that list
-            # and potentially their symlink structure
-            for i in $lis2; do
-                if [ -h $i ]; then
-                    j=$i
-                    while [ -h $j ]; do
-                        lis="$lis $j"
-                        j=`readlink -f $j`
-                    done
-                    lis="$lis $j"
-                elif [ -d $i ]; then
-                    lis3="$lis3 $i"
-                elif [ -f $i ]; then
-                    lis="$lis $i"
-                fi
-            done
-            # And their deps
-            LocateDeps $lis > $MINDI_TMP/udev.lis
-            for i in $lis; do
-                if [ "`echo $i | cut -c1`" = "/" ]; then
-                    j=`echo $i | cut -c2-`
-                    [ "$j" != "" ] && rm -f $mountpoint/$j
-                fi
-                echo "$i" >> $MINDI_TMP/udev.lis
-            done
-            finallist=""
-            # Remove directories from the list, as tar/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/udev.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)
-                    if [ ! -e "$mountpoint/$f" ]; then
-                        finallist="$finallist $f"
-                    fi
-                fi
-            done
-            # But adds the directory useful for udev in $lis3
-            fnllist=`echo $finallist | tr ' ' '\n' | sort -u | tr '\n' ' '`
-            LogFile "INFO: Copying udev related files with cp -a --parents $fnllist -t $mountpoint/"
-            cp -a --parents $fnllist $lis3 -t $mountpoint/ 2> $templog  || LogAll "WARNING: Problem in udev.lis analysis" $templog
-            rm -f $MINDI_TMP/udev.lis
+            CopyFromConf udev
         else
             LogAll "WARNING: udevd daemon not in standard place (/sbin or /usr/bin)"