Changeset 3201


Ignore:
Timestamp:
Nov 28, 2013, 1:11:13 PM (5 years ago)
Author:
bruno
Message:
  • Last update for travel
Location:
branches/3.2/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/deplist.d/minimal.conf

    r3160 r3201  
    5454# Required by ssh as dlopened
    5555/lib/libnss_compat.so
     56/lib64/libnss_compat.so
    5657/usr/lib/libnss_compat.so
    5758/usr/lib64/libnss_compat.so
    5859/lib/libnss_files.so
     60/lib64/libnss_files.so
    5961/usr/lib/libnss_files.so
    6062/usr/lib64/libnss_files.so
  • branches/3.2/mindi/mindi

    r3199 r3201  
    910910    if [ -h "$d" ]; then
    911911        echo "$d"
     912        echo "$d/`basename $file`"
    912913        d2=`readlink $d`
    913914        c2=`echo $d2 | cut -c1`
     
    20872088            mkdir -p $thelink || LogIt "ERROR: Unable to create $thelink in $mountpoint."
    20882089            mv $d/* $thelink 2> /dev/null
    2089             if [ -d "$d" ]; then
     2090            if [ -d "$d" -a ! -h "$d" ]; then
    20902091                rmdir $d
    20912092            fi
    20922093            if [ ! -h $d ]; then
     2094                rm -f $d 2> /dev/null
    20932095                ln -s $thelink $d || LogIt "ERROR: /$d is a symbolic link, but I couldn't create it in $mountpoint."
    20942096            fi
     
    25802582        fi
    25812583    done
    2582     tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
     2584    #tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
     2585    cp -a --parents $finallist . 2>> $MINDI_TMP/$$.log || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
    25832586
    25842587    # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
     
    26362639                fi
    26372640            done
    2638             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
     2641            #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
     2642            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
    26392643            rm -f $MINDI_TMP/udev.lis
    26402644        else
     
    27332737    # Copy FW in case some drivers needs it
    27342738    for d in "/lib" "/usr/lib"; do
    2735         if [ -d "$d/firmware" ]; then
     2739        if [ -d "$d/firmware" -a ! -h $d ]; then
    27362740            cp -a "$d/firmware" "$mountpoint/$d"
    27372741        fi
     
    27402744    # Copy multipath dynamic libraries in case multipath is used (RHEL 6.4 and later)
    27412745    for d in "/lib" "/usr/lib" "/lib64" "/usr/lib64"; do
    2742         if [ -d "$d/multipath" ]; then
     2746        if [ -d "$d/multipath" -a ! -h $d ]; then
    27432747            cp -a "$d/multipath" "$mountpoint/$d"
    27442748        fi
Note: See TracChangeset for help on using the changeset viewer.