Merge openembedded@openembedded.bkbits.net:packages

into handhelds.org:/home/kergoth/code/oe/packages

2004/09/18 07:19:09-04:00 handhelds.org!kergoth
initscripts:
  * Don't symlink urandom startup script, bump PR.
  * Update banner script to fail silently on devices with no VT support.

BKrev: 414c19f0XDhiqRQZYEMnkLpgsr-bIg

diff --git a/initscripts/initscripts-1.0/banner b/initscripts/initscripts-1.0/banner
index e69de29..21a01d2 100644 (file)
--- a/initscripts/initscripts-1.0/banner
+++ b/initscripts/initscripts-1.0/banner
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ ! -e /dev/tty ]; then
+    /bin/mknod -m 0666 /dev/tty c 5 0
+fi
+
+if ( > /dev/tty0 ) 2>/dev/null; then
+    vtmaster=/dev/tty0
+elif ( > /dev/vc/0 ) 2>/dev/null; then
+    vtmaster=/dev/vc/0
+else
+    vtmaster=/dev/null
+fi
+echo > $vtmaster
+echo "Please wait: booting..." > $vtmaster

diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 74ddcde..7e4814e 100644 (file)
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -4,7 +4,7 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -79,13 +79,13 @@ do_install () {
        ln -sf          ../init.d/rmnologin     ${D}/etc/rc4.d/S99rmnologin
        ln -sf          ../init.d/rmnologin     ${D}/etc/rc5.d/S99rmnologin
        ln -sf          ../init.d/sendsigs      ${D}/etc/rc6.d/S20sendsigs
-       ln -sf          ../init.d/urandom       ${D}/etc/rc6.d/S30urandom
+#      ln -sf          ../init.d/urandom       ${D}/etc/rc6.d/S30urandom
        ln -sf          ../init.d/umountnfs.sh  ${D}/etc/rc6.d/S31umountnfs.sh
 #      ln -sf          ../init.d/umountfs      ${D}/etc/rc6.d/S40umountfs
        ln -sf          ../init.d/ramdisk       ${D}/etc/rcS.d/S30ramdisk 
        ln -sf          ../init.d/reboot        ${D}/etc/rc6.d/S90reboot
        ln -sf          ../init.d/sendsigs      ${D}/etc/rc0.d/S20sendsigs
-       ln -sf          ../init.d/urandom       ${D}/etc/rc0.d/S30urandom
+#      ln -sf          ../init.d/urandom       ${D}/etc/rc0.d/S30urandom
        ln -sf          ../init.d/umountnfs.sh  ${D}/etc/rc0.d/S31umountnfs.sh
 #      ln -sf          ../init.d/umountfs      ${D}/etc/rc0.d/S40umountfs
        ln -sf          ../init.d/halt          ${D}/etc/rc0.d/S90halt
@@ -97,7 +97,7 @@ do_install () {
        ln -sf          ../init.d/hostname.sh   ${D}/etc/rcS.d/S40hostname.sh
        ln -sf          ../init.d/mountnfs.sh   ${D}/etc/rcS.d/S45mountnfs.sh
        ln -sf          ../init.d/bootmisc.sh   ${D}/etc/rcS.d/S55bootmisc.sh
-       ln -sf          ../init.d/urandom       ${D}/etc/rcS.d/S55urandom
+#      ln -sf          ../init.d/urandom       ${D}/etc/rcS.d/S55urandom
        ln -sf          ../init.d/finish        ${D}/etc/rcS.d/S99finish
        ln -sf          ../init.d/devices       ${D}/etc/rcS.d/S01devices
        ln -sf          ../init.d/sysfs.sh      ${D}/etc/rcS.d/S36sysfs