Switch to hotplug-ng and tweak sysconfsetup for /etc/networks/interfaces and ehci...

BKrev: 42192b03wZVN4cRgtqs0xPX31y3Klg

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 7386029..e1c8c7d 100644 (file)
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -26,8 +26,10 @@ OPENSLUG_EXTRA_INSTALL += "${OPENSLUG_EXTRA_RDEPENDS}"
 
 # Whether to use the old shell hotplug or the new C hotplug is a
 # distribution decision.
-OPENSLUG_EXTRA_DEPENDS += "linux-hotplug"
-OPENSLUG_EXTRA_RDEPENDS += "linux-hotplug"
+#OPENSLUG_EXTRA_DEPENDS += "linux-hotplug"
+#OPENSLUG_EXTRA_RDEPENDS += "linux-hotplug"
+OPENSLUG_EXTRA_DEPENDS += "hotplug-ng"
+OPENSLUG_EXTRA_RDEPENDS += "hotplug-ng"
 
 BOOTSTRAP_EXTRA_DEPENDS  += "${OPENSLUG_EXTRA_DEPENDS}"
 BOOTSTRAP_EXTRA_RDEPENDS += "${OPENSLUG_EXTRA_RDEPENDS}"

diff --git a/packages/linux/openslug-kernel_2.6.9.bb b/packages/linux/openslug-kernel_2.6.9.bb
index d1a59d8..a4ee115 100644 (file)
--- a/packages/linux/openslug-kernel_2.6.9.bb
+++ b/packages/linux/openslug-kernel_2.6.9.bb
@@ -27,7 +27,9 @@ inherit kernel
 ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
 CMDLINE_CONSOLE ?= "ttyS0,115200n8"
-CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000"
+#CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000"
+CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
+#CMDLINE_ROOT = "root=/dev/ram0 rootfstype=ext2,jffs2 initrd=0x01000000,10M /init=/linuxrc mem=32M@0x00000000"
 CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
 
 do_configure_prepend() {

diff --git a/packages/openslug-init/openslug-init-0.10/sysconfsetup b/packages/openslug-init/openslug-init-0.10/sysconfsetup
index 1b5b901..533354b 100644 (file)
--- a/packages/openslug-init/openslug-init-0.10/sysconfsetup
+++ b/packages/openslug-init/openslug-init-0.10/sysconfsetup
@@ -15,6 +15,7 @@ then
 auto lo
 iface lo inet loopback
 
+auto eth0
 iface eth0 inet static
 EOF
 
@@ -32,3 +33,5 @@ EOF
 fi
 
 modprobe ixp425_eth
+modprobe ehci-hcd
+