2 files changed, 8 insertions, 49 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 39920e5d..58bb9b0e 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -29,50 +29,6 @@ postinit () {
 config_distro () {
 :
 }
-# udev/hotplug - auto device discovery service (deprecated)
-udev_hotplug () {
-:
-}
-
-#############################################################################
-# generate events with the sysfs trigger (most probably obsolete)
-trigger_device_events () {
-  local list=$(echo /sys/bus/*/devices/*/uevent)
-  list="$list $(echo /sys/class/*/*/uevent)"
-  list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
-  for i in $list; do
-    case "$i" in
-      */device/uevent|*\**)
-        continue
-      ;;
-      */class/mem/*|*/class/tty/*)
-        first="$first $i"
-      ;;
-      */block/md*)
-        last="$last $i"
-      ;;
-      */*)
-        default="$default $i"
-      ;;
-    esac
-  done
-  # trigger the sorted events
-  for i in $first $default $last; do
-    echo "add" > "$i"
-  done
-}
-
-#############################################################################
-# mini udev of busybox (most probably obsolete: or distro specific
-# udev_hotplug)
-runudev () {
-if [ -x /bin/mdev ] ; then
-  mdev -s
-else
-  udev_hotplug
-fi
-echo "Started udev"
-}
 
 #############################################################################
 # produce error message and if $2 is empty run (debug) shell
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index ac4a5ccb..67344f93 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -64,7 +64,6 @@ export SLXVERSION="${slxconf_slxver}"
 # do not use dnbd cache file
 nodnbdcache="yes"
 
-
 # mount the important standard directories
 [ ! -f /proc/cpuinfo ] && mount -n -t proc proc /proc
 [ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys
@@ -96,8 +95,7 @@ preinit
 [ -x /bin/preinit.local ] && /bin/preinit.local
 
 # start device auto discovery service - busybox (or distro specific function)
-#mdev -s # enable this one
-runudev #(remove that functions soon, see #129, #130 ...)
+mdev -s
 
 # switch off the several configuration methods, will be switched on
 # according to kernel commandline settings
@@ -123,6 +121,11 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
       [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \
         echo "** SLX init started near $(sysup)"
     ;;
+    # essid for WLAN boot (experimental, might be moved to a module component
+    # in later versions
+    essid=*)
+      essid==${opts#essid=}
+    ;;
     # if configuration should not be gathered by dhcp client
     nodhcp)
       nodhcp="yes"
@@ -693,8 +696,8 @@ umount -n /proc/bus/usb >/dev/null 2>&1
 chmod 1777 /mnt/dev/shm /mnt/tmp /mnt/tmp/scratch 2>/dev/null
 mount -n --move /dev /mnt/dev
 
-# stop udevd (non-busybox udevs) and kill hwautocfg, servconfig
-killall -9 udevd hwautocfg servconfig 2>/mnt/dev/null
+# kill hwautocfg, servconfig
+killall -9 hwautocfg servconfig 2>/mnt/dev/null
 # runtimer
 [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \
   echo "** SLX init ended near $(sysup)"