Changeset 1726 in MondoRescue for branches/2.2.5

Timestamp:

Oct 28, 2007, 6:58:00 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix bugs for DENY_MODS handling
• Add device /dev/console for udev
• ide-generic shold now really be excluded

Location:

branches/2.2.5/mindi

Files:

• mindi (modified) (5 diffs)
• rootfs/etc/udev-links.conf (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -985 +985 @@
     for i in $DENY_MODS; do
         module_list=`echo ${module_list} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
+        EXTRA_MODS=`echo ${EXTRA_MODS} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     done
 ###
@@ -1174 +1175 @@
     for i in $DENY_MODS; do
         list_to_echo=`echo ${list_to_echo} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
+        EXTRA_MODS=`echo ${EXTRA_MODS} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     done
 
@@ -2779 +2781 @@
         if [ -x /sbin/udevd ]; then
             LocateDeps /sbin/udevd /sbin/modprobe /sbin/insmod > $MINDI_TMP/udev.lis
+            rm -f sbin/modprobe sbin/insmod
             cp --parents -Rdf /sbin/udevd /sbin/modprobe /sbin/insmod `sort -u $MINDI_TMP/udev.lis` .
             rm -f $MINDI_TMP/udev.lis
@@ -2846 +2849 @@
     for i in $list_of_groovy_mods ; do
         floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
+    done
+    for i in $DENY_MODS; do
+        floppy_modules=`echo ${floppy_modules} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     done
     for i in $floppy_modules ; do
@@ -3119 +3125 @@
 
 # Compute libata version
-laver=`modinfo libata | grep Version | cut -d: -f2 | cut -d. -f1`
+laver=`modinfo libata | grep -Ei '^Version:' | cut -d: -f2 | cut -d. -f1 | sed 's/  *//g'`
 # If libata v2 is used then remove ide-generic as it will perturbate boot
-if [ `echo "$MODULES" | grep -q libata` ] && [ $laver -ge 2 ]; then
-    DENY_MODS="$DENY_MODS ide-generic"
-    echo "ide-generic removed from module list as your system uses libata v2+"
-    echo "-------------" >> $LOGFILE
+if [ "`echo $MODULES | grep libata`" ]; then
+    if [ $laver -ge 2 ]; then
+        DENY_MODS="$DENY_MODS ide-generic"
+        echo "ide-generic removed from module list as your system uses libata v2+"
+        echo "-------------" >> $LOGFILE
+    fi
 fi
 

branches/2.2.5/mindi/rootfs/etc/udev-links.conf

@@ -50 +50 @@
 M tty7      c 4 7
 M tty8      c 4 8
+L console   /dev/tty0
 
 M null      c   1 3