propagate from branch 'org.openembedded.dev' (head 0f9c1705855ae1ba77ca449fa9fbf0db178a10f3)

            to branch 'org.openembedded.dreambox' (head 31ac9b0d46b66a3fd1261c2d90cd2193a2d46820)

6 files changed, 75 insertions, 6 deletions

diff --git a/packages/sysvinit/sysvinit/nslu2/rcS-default b/packages/sysvinit/sysvinit/nslu2/rcS-default
index 7c34294101..d53be762a7 100644
--- a/packages/sysvinit/sysvinit/nslu2/rcS-default
+++ b/packages/sysvinit/sysvinit/nslu2/rcS-default
@@ -19,5 +19,4 @@ EDITMOTD=no
 # Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup.
 FSCKFIX=yes
 # Set TICKADJ to the correct tick value for this specific machine
-#NSLU2: determined by experiment to be 100/99*10000 usec/tick
-TICKADJ=10101
+#TICKADJ=10000
diff --git a/packages/sysvinit/sysvinit/openslug/.mtn2git_empty b/packages/sysvinit/sysvinit/openslug/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sysvinit/sysvinit/openslug/.mtn2git_empty
diff --git a/packages/sysvinit/sysvinit/openslug/inittab b/packages/sysvinit/sysvinit/openslug/inittab
new file mode 100644
index 0000000000..a82c1f5449
--- /dev/null
+++ b/packages/sysvinit/sysvinit/openslug/inittab
@@ -0,0 +1,32 @@
+# /etc/inittab: init(8) configuration.
+# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $
+
+# The default runlevel. 
+id:3:initdefault:
+
+# Boot-time system configuration/initialization script.
+# This is run first except when booting in emergency (-b) mode.
+si::sysinit:/etc/init.d/rcS
+
+# What to do in single-user mode.
+~~:S:wait:/sbin/sulogin
+
+# /etc/init.d executes the S and K scripts upon change
+# of runlevel.
+#
+# Runlevel 0 is halt.
+# Runlevel 1 is single-user.
+# Runlevels 2-5 are multi-user.
+# Runlevel 6 is reboot.
+
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
+
+ca:123456:ctrlaltdel:/sbin/poweroff
diff --git a/packages/sysvinit/sysvinit/rcS b/packages/sysvinit/sysvinit/rcS
index 9903d33190..e7a7e617d0 100755
--- a/packages/sysvinit/sysvinit/rcS
+++ b/packages/sysvinit/sysvinit/rcS
@@ -12,6 +12,10 @@ prevlevel=N
 umask 022
 export PATH runlevel prevlevel
 
+#	Make sure proc is mounted
+#
+[ -d "/proc/1" ] || mount /proc
+
 #
 #	See if system needs to be setup. This is ONLY meant to
 #	be used for the initial setup after a fresh installation!
@@ -36,7 +40,6 @@ trap ":" INT QUIT TSTP
 #       If so, calculate the number of scripts and the incremental step
 #
 if [ "$VERBOSE" = no ]; then
-    mount /proc
     if [ -e /proc/progress ]; then
         set `ls -1 /etc/rc$runlevel.d/S* | wc`
         numscripts=$1
diff --git a/packages/sysvinit/sysvinit/rcS-default b/packages/sysvinit/sysvinit/rcS-default
index fb22117aae..46e48b9796 100644
--- a/packages/sysvinit/sysvinit/rcS-default
+++ b/packages/sysvinit/sysvinit/rcS-default
@@ -17,3 +17,5 @@ VERBOSE=no
 EDITMOTD=no
 # Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup.
 FSCKFIX=yes
+# Set TICKADJ to the correct tick value for this specific machine
+#TICKADJ=10000
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index e7fe51cfe1..1e1357fdfe 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r15"
+PR = "r19"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
@@ -40,7 +40,7 @@ ALTERNATIVE_PRIORITY = "50"
 
 PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
 FILES_${PN} += "${base_sbindir} ${base_bindir}"
-FILES_sysvinit-pidof = "${base_bindir}/pidof"
+FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit"
 FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
 
 CFLAGS_prepend = "-D_GNU_SOURCE "
@@ -89,7 +89,14 @@ EOF
 		install -d ${D}${sysconfdir}/rc$level.d
 		ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd
 	done
-	mv                 ${D}${base_sbindir}/init               ${D}${base_sbindir}/init.sysvinit
+	mv                 ${D}${base_sbindir}/init               ${D}${base_sbindir}/init.${PN}
+	mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${PN}
+	mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
+	mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
+	mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
+	mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
+	mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
+	mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
 }
 
 do_install_append_opendreambox () {
@@ -98,3 +105,29 @@ do_install_append_opendreambox () {
 gui:2:respawn:/usr/bin/enigma.sh
 EOF
 }
+
+pkg_postinst_${PN} () {
+	update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
+	update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200
+	update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200
+	update-alternatives --install ${bindir}/last last last.${PN} 200
+	update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200
+	update-alternatives --install ${bindir}/wall wall wall.${PN} 200
+}
+
+pkg_prerm_${PN} () {
+	update-alternatives --remove halt halt.${PN}
+	update-alternatives --remove reboot reboot.${PN}
+	update-alternatives --remove shutdown shutdown.${PN}
+	update-alternatives --remove last last.${PN}
+	update-alternatives --remove mesg mesg.${PN}
+	update-alternatives --remove wall wall.${PN}
+}
+
+pkg_postinst_sysvinit-pidof () {
+	update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200
+}
+
+pkg_prerm_sysvinit-pidof () {
+	update-alternatives --remove pidof pidof.${PN}
+}