From d63d3549606cab7ef3f2ee68967f960828acc386 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 1 Jun 2009 13:06:18 -0400 Subject: [PATCH] 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 Acked-by: Koen Kooi Acked-by: Mike Westerhof --- recipes/initscripts/initscripts-1.0/banner | 16 +--------------- .../initscripts/initscripts-1.0/slugos/banner | 4 ---- recipes/initscripts/initscripts_1.0.bb | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 recipes/initscripts/initscripts-1.0/slugos/banner diff --git a/recipes/initscripts/initscripts-1.0/banner b/recipes/initscripts/initscripts-1.0/banner index 0349ce1954..4e69c29e50 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 8e64235acb..0000000000 --- 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 cbcfec5e18..664214436e 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 \ -- 2.39.5