don't run getty on tty1 if USE_VT=0

BKrev: 410d1819Z0hNs0mC-vu6p2i1H0a1qQ

diff --git a/sysvinit/sysvinit-2.85/inittab b/sysvinit/sysvinit-2.85/inittab
index e69de29..36cebc2 100644 (file)
--- a/sysvinit/sysvinit-2.85/inittab
+++ b/sysvinit/sysvinit-2.85/inittab
@@ -0,0 +1,30 @@
+# /etc/inittab: init(8) configuration.
+# $Id$
+
+# The default runlevel.
+id:2: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

diff --git a/sysvinit/sysvinit_2.85.oe b/sysvinit/sysvinit_2.85.oe
index 40c2f6c..128d322 100644 (file)
--- a/sysvinit/sysvinit_2.85.oe
+++ b/sysvinit/sysvinit_2.85.oe
@@ -7,11 +7,12 @@ DESCRIPTION = "System-V like init.\
 PACKAGES = "sysvinit"
 FILES_${PN} = "/sbin ${bindir} ${sysconfdir}"
 FILES_sysv-rc = "${sbindir}"
+PR = "r1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+USE_VT ?= "1"
 
 SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/update-rc.d \
            file://need \
            file://provide \
            file://inittab \
@@ -48,6 +49,22 @@ do_install () {
        if [ ! -z "${SERIAL_CONSOLE}" ]; then
                echo "S:2345:respawn:/sbin/getty ${SERIAL_CONSOLE}" >> ${D}/etc/inittab
        fi
+       if [ "${USE_VT}" == "1" ]; then
+               cat <<EOF >>${D}/etc/inittab
+# /sbin/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+#  <id>:<runlevels>:<action>:<process>
+#
+1:2345:respawn:/sbin/getty 38400 tty1
+# 2:23:respawn:/sbin/getty 38400 tty2
+# 3:23:respawn:/sbin/getty 38400 tty3
+# 4:23:respawn:/sbin/getty 38400 tty4
+EOF
+       fi
        install -m 0644    ${WORKDIR}/rcS-default       ${D}/etc/default/rcS
        install -m 0755    ${WORKDIR}/rc                ${D}/etc/init.d
        install -m 0755    ${WORKDIR}/rcS               ${D}/etc/init.d