Changeset 1726


Ignore:
Timestamp:
Oct 28, 2007, 6:58:00 PM (12 years ago)
Author:
bruno
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1724 r1726  
    985985    for i in $DENY_MODS; do
    986986        module_list=`echo ${module_list} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     987        EXTRA_MODS=`echo ${EXTRA_MODS} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
    987988    done
    988989###
     
    11741175    for i in $DENY_MODS; do
    11751176        list_to_echo=`echo ${list_to_echo} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     1177        EXTRA_MODS=`echo ${EXTRA_MODS} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
    11761178    done
    11771179
     
    27792781        if [ -x /sbin/udevd ]; then
    27802782            LocateDeps /sbin/udevd /sbin/modprobe /sbin/insmod > $MINDI_TMP/udev.lis
     2783            rm -f sbin/modprobe sbin/insmod
    27812784            cp --parents -Rdf /sbin/udevd /sbin/modprobe /sbin/insmod `sort -u $MINDI_TMP/udev.lis` .
    27822785            rm -f $MINDI_TMP/udev.lis
     
    28462849    for i in $list_of_groovy_mods ; do
    28472850        floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
     2851    done
     2852    for i in $DENY_MODS; do
     2853        floppy_modules=`echo ${floppy_modules} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
    28482854    done
    28492855    for i in $floppy_modules ; do
     
    31193125
    31203126# Compute libata version
    3121 laver=`modinfo libata | grep Version | cut -d: -f2 | cut -d. -f1`
     3127laver=`modinfo libata | grep -Ei '^Version:' | cut -d: -f2 | cut -d. -f1 | sed 's/  *//g'`
    31223128# If libata v2 is used then remove ide-generic as it will perturbate boot
    3123 if [ `echo "$MODULES" | grep -q libata` ] && [ $laver -ge 2 ]; then
    3124     DENY_MODS="$DENY_MODS ide-generic"
    3125     echo "ide-generic removed from module list as your system uses libata v2+"
    3126     echo "-------------" >> $LOGFILE
     3129if [ "`echo $MODULES | grep libata`" ]; then
     3130    if [ $laver -ge 2 ]; then
     3131        DENY_MODS="$DENY_MODS ide-generic"
     3132        echo "ide-generic removed from module list as your system uses libata v2+"
     3133        echo "-------------" >> $LOGFILE
     3134    fi
    31273135fi
    31283136
  • branches/2.2.5/mindi/rootfs/etc/udev-links.conf

    r1725 r1726  
    5050M tty7      c 4 7
    5151M tty8      c 4 8
     52L console   /dev/tty0
    5253
    5354M null      c   1 3
Note: See TracChangeset for help on using the changeset viewer.