Change set to make serial-less boot of openslug work again.

BKrev: 427af1fbyL7KN-qsW4bxNflMKEA17A

diff --git a/packages/linux/openslug-kernel_2.6.11.2.bb b/packages/linux/openslug-kernel_2.6.11.2.bb
index ca03d0f..70acbd8 100644 (file)
--- a/packages/linux/openslug-kernel_2.6.11.2.bb
+++ b/packages/linux/openslug-kernel_2.6.11.2.bb
@@ -26,8 +26,8 @@ inherit kernel
 ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
 CMDLINE_CONSOLE ?= "ttyS0,115200n8"
-#CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
-CMDLINE_ROOT ?= "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
+CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc"
+#CMDLINE_ROOT ?= "root=/dev/ram0 rw 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/linuxrc b/packages/openslug-init/openslug-init-0.10/linuxrc
index 47cad6b..7c20a55 100644 (file)
--- a/packages/openslug-init/openslug-init-0.10/linuxrc
+++ b/packages/openslug-init/openslug-init-0.10/linuxrc
@@ -135,12 +135,12 @@ if [ -n "$mounted" ] ; then
 
 else
 
-    exec /bin/init
+    exec /sbin/init
 
 fi
 
 /bin/echo "Can't chroot to $prefroot, using jffs2 ..."
-exec /bin/init
+exec /sbin/init
 
 # Last-resort fall-back - this should never be reached.
 /bin/sh

diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index 3454d29..4359ccc 100644 (file)
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Openslug initial network config via sysconf"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files"
-PR = "r20"
+PR = "r21"
 
 SRC_URI = "file://linuxrc \
           file://sysconfsetup \