Changeset 2437


Ignore:
Timestamp:
Sep 29, 2009, 10:41:56 AM (9 years ago)
Author:
bruno
Message:
  • Fix udev support in init for Mandriva 2009.1 (udevadm settle is blocking)
Location:
branches/2.2.9/mindi
Files:
2 edited

Legend:

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

    r2436 r2437  
    1515/bin/df
    1616/usr/bin/loadkeys
     17/sbin/pidof
    1718
    1819# Compression
     
    6263/sbin/udev
    6364/sbin/udevstart
     65/sbin/create_static_dev_nodes
    6466/etc/init.d/functions
    6567
  • branches/2.2.9/mindi/rootfs/sbin/init

    r2380 r2437  
    297297    fi
    298298    # Depending on udevd version it gives back the hand or not :-(
    299     /sbin/udevd --daemon &
    300     sleep 5
     299    ps | grep udevd 2> /dev/null 1> /dev/null
     300    if [ $? -ne 0 ]; then
     301        /sbin/udevd --daemon &
     302        echo "Waiting for udev to start..."
     303        sleep 5
     304    fi
    301305    mkdir -p /dev/.udev/queue/
    302306    if [ -x /sbin/udevtrigger ]; then
     
    305309    create_dev_makedev
    306310    # Newer version use udevadm for that
    307     if [ -x /sbin/udevadm ]; then
    308             /sbin/udevadm settle --timeout=10
    309     elif [ -x /sbin/udevsettle ]; then
     311    if [ -x /sbin/udevsettle ]; then
    310312        /sbin/udevsettle
     313    elif [ -x /sbin/udevadm ]; then
     314        /sbin/udevadm trigger
     315        /sbin/udevadm settle --timeout=10 &
     316        echo "Waiting for udev to discover..."
     317        sleep 10
    311318    fi
    312319    # It seems we need to have more static devs on some distro were
Note: See TracChangeset for help on using the changeset viewer.