early: finished removal of hotplug2, removed udev patch and emptied modprobe.conf. See note

With the modprobe.conf that we used to ship with early modprobe failed to work.
An empty modprobe.conf makes modprobe work, but might cause issues with autoloading
of modules at boot time <= this needs to be checked and refined, maybe we need to
ship a saner modprobe.conf.

target/early/build-initramfs.in

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: target/early/build-initramfs.in
-# Copyright (C) 2007 - 2009 The OpenSDE Project
+# Copyright (C) 2007 - 2010 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -28,9 +28,6 @@ initramfs_install() {
 	case "$1" in
 		udev)	cp -a "$root/lib/udev/devices"/* "$initrddir/dev/"
 			return 0 ;;
-		hotplug2)
-			cp "$root/sbin/hotplug2-modwrap" "$initrddir/sbin/"
-			;;
 		strace)
 			cp "$root/usr/bin/strace" "$initrddir/bin/"
 			;;
@@ -60,10 +57,6 @@ early_adjust_initrd() {
 
 	mkdir "${rootfs}/rootfs"
 
-	# HACK: bb's modprobe needs insmod on PATH, but udev clears it
-	# HACK: additionaly bb's modprobe doesn't handle MODALIAS properly
-	# HACK: so we use our own wrapper on top of bb's
-	rm ${rootfs}/sbin/modprobe
 }
 
 initramfs_install_pattern() {
@@ -72,7 +65,7 @@ initramfs_install_pattern() {
 	case "$pkg_name" in
 	udev)
 		echo -n "-n -e '/etc\/udev\//p;' -e '/lib.*\/udev\/devices\//p;' -e '/lib\/udev\/.*_id$/p;' "
-		echo "-e '/sbin\/\(udevd\|udevadm\)$/P'"
+		echo "-e '/sbin\/\(udevd\|udevadm\)$/P' -e '/lib\/udev\/rules.d\//p;'"
 		;;
 	lvm2)
 		echo "$@ -e '/sbin\/lvmdump$/d;'"

target/early/busybox.config

@@ -34,6 +34,7 @@ X CONFIG_FEATURE_PRESERVE_HARDLINKS
 
 X CONFIG_ECHO
 X CONFIG_FEATURE_FANCY_ECHO
+X CONFIG_TEE
 
 X CONFIG_LS
 X CONFIG_FEATURE_LS_USERNAME

target/early/initramfs/etc_modprobe.conf.txt

@@ -1,205 +1,11 @@
-#
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# Filename: target/early/initrd/etc_modprobe.conf.txt
-# Copyright (C) 2007 The OpenSDE Project
-# Copyright (C) 1998 - 2003 Clifford Wolf
-# 
+#
+# Filename: target/early/initramfs/etc_modprobe.conf.txt
+# Copyright (C) 2010 The OpenSDE Project
+#
 # More information can be found in the files COPYING and README.
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-#
-# See 'man 5 modprobe.conf' for details.
-
-# Host specific aliases
-
-#alias parport_lowlevel	parport_pc
-#options	parport_pc	io=0x378 irq=auto
-
-alias /dev/snd/*		/dev/snd
-alias /dev/sound*		snd-pcm-oss snd-mixer-oss snd-seq-oss
-
-#alias /dev/input/js*		joydev pcigame analog
-#alias /dev/usb/lp0             printer
-
-# ALSA default setup
-alias char-major-116-* snd
-alias sound-service-0-0 snd-mixer-oss
-alias sound-service-0-1 snd-seq-oss
-alias sound-service-0-3 snd-pcm-oss
-alias sound-service-0-8 snd-seq-oss
-alias sound-service-0-12 snd-pcm-oss
-alias sound-service-1-0 snd-mixer-oss
-alias sound-service-1-3 snd-pcm-oss
-alias sound-service-1-8 snd-seq-oss
-alias sound-service-1-12 snd-pcm-oss
-
-alias /dev/nvidia*	nvidia
-
-# Generic aliases
-alias /dev/loop		loop
-alias ppp		ppp_generic
-
-alias binfmt-204 binfmt_aout
-alias binfmt-263 binfmt_aout
-alias binfmt-264 binfmt_aout
-alias binfmt-267 binfmt_aout
-alias binfmt-387 binfmt_aout
-alias binfmt-332 iBCS
-alias binfmt--310 binfmt_java
-alias block-major-1-* rd
-alias block-major-2-* floppy
-alias block-major-3-* ide-probe-mod
-alias block-major-7-* loop
-alias block-major-8-* sd_mod
-alias block-major-9-* md
-alias block-major-11-* sr_mod
-alias block-major-13-* xd
-alias block-major-15-* cdu31a
-alias block-major-16-* gscd
-alias block-major-17-* optcd
-alias block-major-18-* sjcd
-alias block-major-20-* mcdx
-alias block-major-22-* ide-probe-mod
-alias block-major-23-* mcd
-alias block-major-24-* sonycd535
-alias block-major-25-* sbpcd
-alias block-major-26-* sbpcd
-alias block-major-27-* sbpcd
-alias block-major-29-* aztcd
-alias block-major-32-* cm206
-alias block-major-33-* ide-probe-mod
-alias block-major-34-* ide-probe-mod
-alias block-major-37-* ide-tape
-alias block-major-44-* ftl
-alias block-major-46-* pcd
-alias block-major-47-* pf
-alias block-major-56-* ide-probe-mod
-alias block-major-57-* ide-probe-mod
-alias block-major-58-* lvm-mod
-alias block-major-88-* ide-probe-mod
-alias block-major-89-* ide-probe-mod
-alias block-major-90-* ide-probe-mod
-alias block-major-91-* ide-probe-mod
-alias block-major-93-* nftl
-alias block-major-97-* pg
-alias block-major-113-* viocd
-alias char-major-4-* serial
-alias char-major-5-* serial
-alias char-major-6-* lp
-alias char-major-9-* st
-alias char-major-10-0 busmouse
-alias char-major-10-2 msbusmouse
-alias char-major-10-3 atixlmouse
-alias char-major-10-130 wdt
-alias char-major-10-131 wdt
-alias char-major-10-139 openprom
-alias char-major-10-144 nvram
-alias char-major-10-157 applicom
-alias char-major-10-175 agpgart
-alias char-major-10-184 microcode
-alias char-major-10-200 tun
-alias char-major-10-250 hci_vhci
-alias char-major-13-* analog
-alias char-major-13-0 joydev
-alias char-major-13-32 mousedev
-alias char-major-14-* soundcore
-alias char-major-19-* cyclades
-alias char-major-20-* cyclades
-alias char-major-21-* sg
-alias char-major-22-* pcxx
-alias char-major-23-* pcxx
-alias char-major-27-* ftape
-alias char-major-34-* scc
-alias char-major-35-* tclmidi
-alias char-major-36-* netlink
-alias char-major-37-* ide-tape
-alias char-major-48-* riscom8
-alias char-major-49-* riscom8
-alias char-major-57-* esp
-alias char-major-58-* esp
-alias char-major-63-* kdebug
-alias char-major-90-* mtdchar
-alias char-major-96-* pt
-alias char-major-99-* ppdev
-alias char-major-107-* 3dfx
-alias char-major-108-* ppp_generic
-alias char-major-109-* lvm-mod
-alias char-major-161-* ircomm-tty
-alias char-major-171-* raw1394
-alias char-major-195-* NVdriver
-alias char-major-200-* vxspec
-alias char-major-206-* osst
-alias char-major-216-* rfcomm
-alias dos msdos
-alias dummy0 dummy
-alias dummy1 dummy
-alias eth0 your-card
-alias iso9660 isofs
-alias md-personality-1 linear
-alias md-personality-2 raid0
-alias md-personality-3 raid1
-alias md-personality-4 raid5
-alias md-personality-7 multipath
-alias net-pf-1 unix
-alias net-pf-2 ipv4
-alias net-pf-4 ipx
-alias net-pf-5 appletalk
-alias net-pf-10 ipv6
-alias net-pf-15 af_key
-alias net-pf-17 af_packet
-alias net-pf-31 bluez
-alias netalias-2 ip_alias
-alias irlan0 irlan
-alias irda-dongle-0 tekram
-alias irda-dongle-1 esi
-alias irda-dongle-2 actisys
-alias irda-dongle-3 actisys
-alias irda-dongle-4 girbil
-alias irda-dongle-5 litelink
-alias irda-dongle-6 airport
-alias irda-dongle-7 old_belkin
-alias bt-proto-0 l2cap
-alias bt-proto-2 sco
-alias bt-proto-3 rfcomm
-alias bt-proto-4 bnep
-alias plip0 plip
-alias plip1 plip
-alias tunl0 ipip
-alias cipcb0 cipcb
-alias cipcb1 cipcb
-alias cipcb2 cipcb
-alias cipcb3 cipcb
-alias ppp0 ppp_generic
-alias ppp1 ppp_generic
-alias slip0 slip
-alias slip1 slip
-alias tty-ldisc-1 slip
-alias tty-ldisc-3 ppp_async
-alias tty-ldisc-11 irtty
-alias tty-ldisc-14 ppp_synctty
-alias tty-ldisc-15 hci_uart
-alias ppp-compress-18 ppp_mppe
-alias ppp-compress-21 bsd_comp
-alias ppp-compress-24 ppp_deflate
-alias ppp-compress-26 ppp_deflate
-alias parport_lowlevel parport_pc
-alias usbdevfs usbcore
-alias xfrm-type-2-50 esp4
-alias xfrm-type-2-51 ah4
-alias xfrm-type-2-108 ipcomp
-alias xfrm-type-10-50 esp6
-alias xfrm-type-10-51 ah6
-alias xfrm-type-10-108 ipcomp6
-alias cipher_null crypto_null
-alias digest_null crypto_null
-alias compress_null crypto_null
-alias sha384 sha512
-alias char-major-89-* i2c-dev
-alias net-pf-24 pppoe
-

target/early/initramfs/sbin_modprobe.sh

@@ -1,18 +1,24 @@
 #!/bin/sh
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# Filename: target/early/initrd/sbin_bb-modprobe.exec
-# Copyright (C) 2007 The OpenSDE Project
-# 
+#
+# Filename: target/early/initramfs/sbin_modprobe.sh
+# Copyright (C) 2007 - 2010 The OpenSDE Project
+#
 # More information can be found in the files COPYING and README.
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
-
+for x; do
+	if [ "$x" != "-b" ]; then
+		args="$args $x";
+	fi
+done
 export PATH
-exec /bin/busybox modprobe "$@"
+LOG="/var/log/modprobe.log"
+echo "[$$] modprobe $*" >> "$LOG"
+exec /bin/busybox modprobe $args 2>&1 | tee -a "$LOG" >&2
 

target/early/pkg_udev.patch

@@ -1,21 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: target/early/pkg_udev.patch
-# Copyright (C) 2007 - 2009 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- ./rules/rules.d/80-drivers.rules.orig	2007-10-11 18:31:13.000000000 -0400
-+++ ./rules/rules.d/80-drivers.rules	2007-10-11 18:38:29.000000000 -0400
-@@ -5 +5 @@
--DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe -b $env{MODALIAS}"
-+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/hotplug2-modwrap $env{MODALIAS}"