Changeset 3148 in MondoRescue for branches/3.1/mindi/mindi

Timestamp:

Jun 19, 2013, 8:50:28 AM (11 years ago)

Author:

Bruno Cornec

Message:

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

File:

• branches/3.1/mindi/mindi (modified) (7 diffs)

branches/3.1/mindi/mindi

@@ -2234 +2234 @@
             # Used by ia64
             if [ "`gzip -cd $fname | strings 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
-                LogAll "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
+                LogFile "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
                 duff_kernels="$fname $duff_kernels"
             else
@@ -2242 +2242 @@
         else
             if [ "`strings $fname 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
-                LogAll "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
+                LogFile "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
                 duff_kernels="$fname $duff_kernels"
             else
@@ -2541 +2541 @@
             echo $i >> $MINDI_TMP/cp.lis
         fi
+        if [ -L $mountpoint/$i ] && [ `echo "$i" | grep "\.ko$"` ]; then
+            echo "Replacing module symlink ($i) with actual file"
+            rm -f $mountpoint/$i
+            cp -Lf $i $mountpoint/$i
+            ls -l $mountpoint/$i
+        fi
     done
 
@@ -2720 +2726 @@
 fi
 
-> $LOGFILE
 LogFile "mindi v$MINDI_VERSION"
 LogFile "$ARCH architecture detected"
@@ -2728 +2733 @@
 LogFile "-----------------------------"
 
+[ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && LogAll "/sbin/mkfs.vfat is missing!"
+
 # Log some capital variables
 [ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
 [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
-LogFile "MONDO_SHARE = $MONDO_SHARE" 
+LogFile "MONDO_SHARE = $MONDO_SHARE"
 LogFile "MINDI_DATA = $MINDI_DATA" 
-LogFile "MINDI_SBIN = $MINDI_SBIN" 
-LogFile "MINDI_CONF = $MINDI_CONF" 
+LogFile "MINDI_SBIN = $MINDI_SBIN"
+LogFile "MINDI_CONF = $MINDI_CONF"
 if [ -f $MINDI_CONFIG ]; then
     LogFile "-----------------------------"
@@ -2835 +2842 @@
     LogFile "No file /etc/mdadm.conf"
 fi
-LogFile "-------------" 
-LogFile "cat $CMDLINE" 
-LogFile "-------------" 
+LogFile "-------------"
+LogFile "cat $CMDLINE"
+LogFile "-------------"
 cat $CMDLINE >> $LOGFILE
-LogFile "-------------" 
-LogFile "cat /proc/swaps:" 
-LogFile "-------------" 
+LogFile "-------------"
+LogFile "cat /proc/swaps:"
+LogFile "-------------"
 cat /proc/swaps >> $LOGFILE
 LogFile "-------------"
@@ -3123 +3130 @@
     LogIt "Mindi-`$MINDI_LIB/rootfs/bin/busybox 2>&1 | head -1`"
 else
-    LogIt "ERROR: No mindi-busybox installed"
+    LogIt "WARNING: No mindi-busybox installed"
 fi