Changeset 3201 in MondoRescue for branches

Timestamp:

Nov 28, 2013, 1:11:13 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Last update for travel

Location:

branches/3.2/mindi

Files:

• deplist.d/minimal.conf (modified) (1 diff)
• mindi (modified) (6 diffs)

branches/3.2/mindi/deplist.d/minimal.conf

@@ -54 +54 @@
 # Required by ssh as dlopened
 /lib/libnss_compat.so
+/lib64/libnss_compat.so
 /usr/lib/libnss_compat.so
 /usr/lib64/libnss_compat.so
 /lib/libnss_files.so
+/lib64/libnss_files.so
 /usr/lib/libnss_files.so
 /usr/lib64/libnss_files.so

branches/3.2/mindi/mindi

@@ -910 +910 @@
     if [ -h "$d" ]; then
         echo "$d"
+        echo "$d/`basename $file`"
         d2=`readlink $d`
         c2=`echo $d2 | cut -c1`
@@ -2087 +2088 @@
             mkdir -p $thelink || LogIt "ERROR: Unable to create $thelink in $mountpoint."
             mv $d/* $thelink 2> /dev/null
-            if [ -d "$d" ]; then
+            if [ -d "$d" -a ! -h "$d" ]; then
                 rmdir $d
             fi
             if [ ! -h $d ]; then
+                rm -f $d 2> /dev/null
                 ln -s $thelink $d || LogIt "ERROR: /$d is a symbolic link, but I couldn't create it in $mountpoint."
             fi
@@ -2580 +2582 @@
         fi
     done
-    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
+    #tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
+    cp -a --parents $finallist . 2>> $MINDI_TMP/$$.log || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
 
     # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
@@ -2636 +2639 @@
                 fi
             done
-            tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
+            #tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
+            cp --parents -a $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log $mountpoint/  || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
             rm -f $MINDI_TMP/udev.lis
         else
@@ -2733 +2737 @@
     # Copy FW in case some drivers needs it
     for d in "/lib" "/usr/lib"; do
-        if [ -d "$d/firmware" ]; then
+        if [ -d "$d/firmware" -a ! -h $d ]; then
             cp -a "$d/firmware" "$mountpoint/$d"
         fi
@@ -2740 +2744 @@
     # Copy multipath dynamic libraries in case multipath is used (RHEL 6.4 and later)
     for d in "/lib" "/usr/lib" "/lib64" "/usr/lib64"; do
-        if [ -d "$d/multipath" ]; then
+        if [ -d "$d/multipath" -a ! -h $d ]; then
             cp -a "$d/multipath" "$mountpoint/$d"
         fi