[oe-commits] Tom Rini : initscripts: Get rid of the vtmaster stuff, bump PR.

git version control git at git.openembedded.org
Mon Jun 1 22:11:54 UTC 2009


Module: openembedded.git
Branch: xora/angstrom-srcpv
Commit: d63d3549606cab7ef3f2ee68967f960828acc386
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d63d3549606cab7ef3f2ee68967f960828acc386

Author: Tom Rini <trini at embeddedalley.com>
Date:   Mon Jun  1 13:06:18 2009 -0400

initscripts: Get rid of the vtmaster stuff, bump PR.
I ran into this on my boards that start out with the really minimal
(console and null only) set of dev nodes prior to udev running.  The
banner script looks around for what might be the vtmaster (aka what's
got console) to say that we're booting.  But that's where things go by
default anyhow.

Signed-off-by: Tom Rini <trini at embeddedalley.com>
Acked-by: Koen Kooi <koen at openembedded.org>
Acked-by: Mike Westerhof <mwester at dls.net>

---

 recipes/initscripts/initscripts-1.0/banner        |   16 +---------------
 recipes/initscripts/initscripts-1.0/slugos/banner |    4 ----
 recipes/initscripts/initscripts_1.0.bb            |    2 +-
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/recipes/initscripts/initscripts-1.0/banner b/recipes/initscripts/initscripts-1.0/banner
index 0349ce1..4e69c29 100644
--- a/recipes/initscripts/initscripts-1.0/banner
+++ b/recipes/initscripts/initscripts-1.0/banner
@@ -1,17 +1,3 @@
 #!/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
-elif ( > /dev/console ) 2>/dev/null; then
-    vtmaster=/dev/console
-else
-    vtmaster=/dev/null
-fi
-echo > $vtmaster
-echo "Please wait: booting..." > $vtmaster
+echo "Please wait: booting..."
diff --git a/recipes/initscripts/initscripts-1.0/slugos/banner b/recipes/initscripts/initscripts-1.0/slugos/banner
deleted file mode 100644
index 8e64235..0000000
--- a/recipes/initscripts/initscripts-1.0/slugos/banner
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#NOTE: this script may execute with absolutely nothing
-# in /dev
-echo "SlugOS booting..."
diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb
index cbcfec5..6642144 100644
--- a/recipes/initscripts/initscripts_1.0.bb
+++ b/recipes/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r114"
+PR = "r115"
 
 SRC_URI = "file://functions \
            file://halt \





More information about the Openembedded-commits mailing list