Ignore:
Timestamp:
Jun 19, 2013, 8:50:28 AM (7 years ago)
Author:
Bruno Cornec
Message:

2nd phase for svn merge -r 2935:3146 ../3.0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.1/mindi/mindi

    r3147 r3148  
    22342234            # Used by ia64
    22352235            if [ "`gzip -cd $fname | strings 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
    2236                 LogAll "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
     2236                LogFile "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
    22372237                duff_kernels="$fname $duff_kernels"
    22382238            else
     
    22422242        else
    22432243            if [ "`strings $fname 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
    2244                 LogAll "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
     2244                LogFile "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
    22452245                duff_kernels="$fname $duff_kernels"
    22462246            else
     
    25412541            echo $i >> $MINDI_TMP/cp.lis
    25422542        fi
     2543        if [ -L $mountpoint/$i ] && [ `echo "$i" | grep "\.ko$"` ]; then
     2544            echo "Replacing module symlink ($i) with actual file"
     2545            rm -f $mountpoint/$i
     2546            cp -Lf $i $mountpoint/$i
     2547            ls -l $mountpoint/$i
     2548        fi
    25432549    done
    25442550
     
    27202726fi
    27212727
    2722 > $LOGFILE
    27232728LogFile "mindi v$MINDI_VERSION"
    27242729LogFile "$ARCH architecture detected"
     
    27282733LogFile "-----------------------------"
    27292734
     2735[ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && LogAll "/sbin/mkfs.vfat is missing!"
     2736
    27302737# Log some capital variables
    27312738[ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
    27322739[ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
    2733 LogFile "MONDO_SHARE = $MONDO_SHARE" 
     2740LogFile "MONDO_SHARE = $MONDO_SHARE"
    27342741LogFile "MINDI_DATA = $MINDI_DATA"
    2735 LogFile "MINDI_SBIN = $MINDI_SBIN" 
    2736 LogFile "MINDI_CONF = $MINDI_CONF" 
     2742LogFile "MINDI_SBIN = $MINDI_SBIN"
     2743LogFile "MINDI_CONF = $MINDI_CONF"
    27372744if [ -f $MINDI_CONFIG ]; then
    27382745    LogFile "-----------------------------"
     
    28352842    LogFile "No file /etc/mdadm.conf"
    28362843fi
    2837 LogFile "-------------" 
    2838 LogFile "cat $CMDLINE" 
    2839 LogFile "-------------" 
     2844LogFile "-------------"
     2845LogFile "cat $CMDLINE"
     2846LogFile "-------------"
    28402847cat $CMDLINE >> $LOGFILE
    2841 LogFile "-------------" 
    2842 LogFile "cat /proc/swaps:" 
    2843 LogFile "-------------" 
     2848LogFile "-------------"
     2849LogFile "cat /proc/swaps:"
     2850LogFile "-------------"
    28442851cat /proc/swaps >> $LOGFILE
    28452852LogFile "-------------"
     
    31233130    LogIt "Mindi-`$MINDI_LIB/rootfs/bin/busybox 2>&1 | head -1`"
    31243131else
    3125     LogIt "ERROR: No mindi-busybox installed"
     3132    LogIt "WARNING: No mindi-busybox installed"
    31263133fi
    31273134
Note: See TracChangeset for help on using the changeset viewer.