Numerous openprotium fixes as we transition to udev based root

and task based build

4 files changed, 33 insertions, 12 deletions

diff --git a/packages/openprotium-init/files/boot/disk b/packages/openprotium-init/files/boot/disk
index b4bbaf1f3c..e1096e225a 100644
--- a/packages/openprotium-init/files/boot/disk
+++ b/packages/openprotium-init/files/boot/disk
@@ -25,9 +25,6 @@ then
 		sleep=6
 		test "$sleep" -gt 0 && sleep "$sleep"
 	else
-		# make the device links so turnup can use short disk names.
-		# probably only necessary on devfs based systems.
-		/etc/init.d/devices start
 		scc -l redflash -f auto
 	fi
 	#
diff --git a/packages/openprotium-init/files/functions b/packages/openprotium-init/files/functions
index 25832cf3f9..2700551cc4 100644
--- a/packages/openprotium-init/files/functions
+++ b/packages/openprotium-init/files/functions
@@ -65,21 +65,13 @@ load_functions(){
 #  use this rather than hard-wiring the device because the partition
 #  table can change - looking in /proc/mtd is more reliable.
 mtdev(){
-	if test $(machine) = storcenter ; then                               
-	sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtd/\1!p' /proc/mtd
-	else
 	sed -n 's!^\(mtd[0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/\1!p' /proc/mtd
-	fi
 }
 #
 # mtblockdev "name"
 #  as mtdev but output the name of the block (not character) device
 mtblockdev(){
-	if test "$(machine)" = storcenter ; then
-	sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtdblock/\1!p' /proc/mtd
-	else
 	sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtdblock\1!p' /proc/mtd
-	fi
 }
 #
 # mtsize "name"
diff --git a/packages/openprotium-init/files/initscripts/zleds b/packages/openprotium-init/files/initscripts/zleds
new file mode 100644
index 0000000000..37adb8490e
--- /dev/null
+++ b/packages/openprotium-init/files/initscripts/zleds
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# This script is executed at the start and end of each run-level
+# transition.  It is the first 'stop' script and the last 'start'
+# script.
+#
+# 'stop'  indicates the start of a runlevel change
+# 'start' at the end of the runlevel change - we are in the new
+#         runlevel.
+#
+# state outputs 'system', 'user' etc according the the nature of
+# the runlevel it is passed (the *new* runlevel is used).
+state(){
+	case "$1" in
+	S|N)     echo system;;
+	0|6)     echo shutdown;;
+	1)       echo singleuser;;
+	2|3|4|5) echo user;;
+	*)       echo "led change: $runlevel: runlevel unknown" >&2
+		 echo system;;
+	esac
+}
+
+case "$1" in
+start)	scc -l blue -f auto;;
+stop)	scc -l redflash;;
+*)	echo "led change: $1: command ignored" >&2
+	;;
+esac
diff --git a/packages/openprotium-init/openprotium-init_0.10.bb b/packages/openprotium-init/openprotium-init_0.10.bb
index 92c9d789cb..f8facbb36f 100644
--- a/packages/openprotium-init/openprotium-init_0.10.bb
+++ b/packages/openprotium-init/openprotium-init_0.10.bb
@@ -19,6 +19,7 @@ SRC_URI = "file://boot/flash \
 	   file://initscripts/sysconfsetup \
 	   file://initscripts/umountinitrd.sh \
 	   file://initscripts/loadmodules.sh \
+	   file://initscripts/zleds \
 	   file://functions \
 	   file://modulefunctions \
 	   file://conffiles \
@@ -35,7 +36,7 @@ SCRIPTS = "turnup reflash sysconf"
 BOOTSCRIPTS = "flash disk nfs network udhcpc.script"
 INITSCRIPTS = "syslog.buffer syslog.file syslog.network \
 	rmrecovery sysconfsetup umountinitrd.sh \
-	fixfstab loadmodules.sh"
+	fixfstab loadmodules.sh zleds"
 
 # This just makes things easier...
 
@@ -129,6 +130,8 @@ pkg_postinst_openprotium-init() {
 	update-rc.d $opt syslog.file		start 39 S . start 47 0 6 .
 	update-rc.d $opt syslog.network		start 44 S . start 39 0 6 .
 	update-rc.d $opt rmrecovery             start 99 1 2 3 4 5 .
+	update-rc.d $opt zleds                  start 99 1 2 3 4 5 . stop 5 0 1 2 3 4 5 6 .
+
 }
 
 pkg_postrm_openprotium-init() {