5 files changed, 34 insertions, 8 deletions
diff --git a/packages/initscripts/initscripts-1.0/device_table.txt b/packages/initscripts/initscripts-1.0/device_table.txt
index 35560b4025..a302c5aca3 100644
--- a/packages/initscripts/initscripts-1.0/device_table.txt
+++ b/packages/initscripts/initscripts-1.0/device_table.txt
@@ -160,6 +160,24 @@
 /dev/smtpe2	c	640	0	0	35	130	-	-	-
 /dev/smtpe3	c	640	0	0	35	131	-	-	-
 /dev/sndstat	c	660	0	29	14	6	-	-	-
+/dev/snd/seq	c	660	0	0	116	1	-	-	-
+/dev/snd/timer	c	660	0	0	116	33	-	-	-
+/dev/snd/controlC0	c	660	0	0	116	0	-	-	-
+/dev/snd/controlC1	c	660	0	0	116	32	-	-	-
+/dev/snd/controlC2	c	660	0	0	116	64	-	-	-
+/dev/snd/controlC3	c	660	0	0	116	96	-	-	-
+/dev/snd/hwC0D0	c	660	0	0	116	4	-	-	-
+/dev/snd/hwC0D1	c	660	0	0	116	5	-	-	-
+/dev/snd/hwC0D2	c	660	0	0	116	6	-	-	-
+/dev/snd/hwC0D3	c	660	0	0	116	7	-	-	-
+/dev/snd/pcmC0D0c	c	660	0	0	116	24	-	-	-
+/dev/snd/pcmC0D0p	c	660	0	0	116	16	-	-	-
+/dev/snd/pcmC0D1c	c	660	0	0	116	25	-	-	-
+/dev/snd/pcmC0D1p	c	660	0	0	116	17	-	-	-
+/dev/snd/pcmC0D2c	c	660	0	0	116	26	-	-	-
+/dev/snd/pcmC0D2p	c	660	0	0	116	18	-	-	-
+/dev/snd/pcmC0D3c	c	660	0	0	116	27	-	-	-
+/dev/snd/pcmC0D3p	c	660	0	0	116	19	-	-	-
 /dev/st0	c	660	0	11	9	0	-	-	-
 /dev/st0a	c	660	0	11	9	96	-	-	-
 /dev/st0l	c	660	0	11	9	32	-	-	-
diff --git a/packages/initscripts/initscripts-1.0/devices b/packages/initscripts/initscripts-1.0/devices
index fb0f851d16..67a2ec8092 100755
--- a/packages/initscripts/initscripts-1.0/devices
+++ b/packages/initscripts/initscripts-1.0/devices
@@ -50,6 +50,7 @@ else
 	mkdir -p dev/msys
 	mkdir -p dev/pts
 	mkdir -p dev/vc
+	mkdir -p dev/snd
 	for i in 0 1 2 3 4 5 6 7 8 9; do
 		ln -s /dev/tty$i /dev/vc/$i
 	done
diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
index f22bf2fdfe..2c2132209f 100755
--- a/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -10,7 +10,7 @@ COREDEF="00_core"
 
 create_file() {
 	EXEC=" 
-	touch \"$1\" 
+	touch \"$1\"; 
 	chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 
 	chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " 
 
@@ -21,7 +21,7 @@ create_file() {
 
 mk_dir() {
 	EXEC=" 
-	mkdir -p \"$1\" 
+	mkdir -p \"$1\"; 
 	chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 
 	chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
 
diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb
index dcb57e92bb..4fb6926490 100644
--- a/packages/initscripts/initscripts-slugos_1.0.bb
+++ b/packages/initscripts/initscripts-slugos_1.0.bb
@@ -4,14 +4,14 @@
 # problems in the initscripts on SlugOS.  The problems
 # mostly come down to the order the scripts are executed
 # in.
-require initscripts_${PV}.bb
+include initscripts_${PV}.bb
 
 MAINTAINER = "John Bowler <jbowler@acm.org>"
 RCONFLICTS = "initscripts"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.9"
+PR := "${PR}.11"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
@@ -64,15 +64,20 @@ do_install_append() {
 	# udev will run at S04 if installed
 	rm	${D}${sysconfdir}/rcS.d/S03sysfs
 	rm	${D}${sysconfdir}/rcS.d/S38devpts.sh
-#	rm	${D}${sysconfdir}/rcS.d/S06alignment
+	rm -f	${D}${sysconfdir}/rcS.d/S06alignment
+	rm 	${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
+	rm 	${D}${sysconfdir}/rc0.d/S25save-rtc.sh
+	rm      ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
+
+
 
 	# Check the result
 	find ${D}${sysconfdir}/rc?.d ! -type d -print | {
 		status=0
 		while read d
 		do
-			oenote "initscripts-slugos: unexpected link $f"
-			status = 1
+			oenote "initscripts-slugos: unexpected link $d"
+			status=1
 		done
 		test $status -eq 0 ||
 			oefatal "initscripts-slugos: new links break do_install"
@@ -102,6 +107,7 @@ do_install_append() {
 	# base-files populate-volatile.sh runs at S37
 	update-rc.d -r ${D} devpts.sh		start 38 S .
 	# slugos file syslog starts here (39)
+	update-rc.d -r ${D} populate-volatile.sh	start 37 S .
 
 	# set hostname and domainname before the network script works (by
 	# entering them at level 40), networking may reset them.
@@ -138,6 +144,7 @@ do_install_append() {
 	# This is the special, correct, slugos umountnfs.sh (it looks in
 	# the /proc/mounts information, not /etc/fstab)
 	update-rc.d -r ${D} umountnfs.sh	start 31 0 6 .
+	update-rc.d -r ${D} save-rtc.sh		start 25 0 6 .
 	# portmap stops at 32
 	# slugos network syslog stops here (39)
 	# networking stops at 40 (nothing else does, believe me.)
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 29747d41c2..9cf7e47de0 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -92,7 +92,7 @@ do_install () {
 # Install device dependent scripts
 #
 
-	if [ "${DISTRO}" == "openzaurus" ]; then
+	if [ "${DISTRO}" = "openzaurus" ]; then
 		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}${sysconfdir}/init.d/checkversion
 		chmod 0755	${D}${sysconfdir}/init.d/checkversion
 		ln -sf		../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version