[oe-commits] Martin Jansa : initscripts-shr: drop ttySACx workarround and better ROOT_HOME detection

[git version control]

Module: openembedded.git
Branch: master
Commit: 4ae02b5b270b32d203672888ea03e357ce6ec4c6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4ae02b5b270b32d203672888ea03e357ce6ec4c6

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Sep 28 15:39:08 2010 +0200

initscripts-shr: drop ttySACx workarround and better ROOT_HOME detection

* ttySACx are fixed in kernels 2.6.32.23 and 2.6.34.7 and newer, fixed
  by kernel patch from Radek Polak
* ROOT_HOME problem found and fixed by Joachim Ott

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/shr/initscripts-shr/mountall.sh      |    2 +-
 recipes/shr/initscripts-shr/mountdevsubfs.sh |    3 ---
 recipes/shr/initscripts-shr_0.0.1.bb         |    2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/recipes/shr/initscripts-shr/mountall.sh b/recipes/shr/initscripts-shr/mountall.sh
index 4bd7bbb..0bea871 100644
--- a/recipes/shr/initscripts-shr/mountall.sh
+++ b/recipes/shr/initscripts-shr/mountall.sh
@@ -41,7 +41,7 @@ fi
 
 if test -e /etc/passwd
 then
-	ROOT_HOME="`grep root /etc/passwd | cut -d: -f6`"
+	ROOT_HOME="`grep \"^root:\" /etc/passwd | cut -d: -f6`"
 
 	if test -n "$ROOT_HOME"
 	then
diff --git a/recipes/shr/initscripts-shr/mountdevsubfs.sh b/recipes/shr/initscripts-shr/mountdevsubfs.sh
index 2a0a7a6..4308dab 100644
--- a/recipes/shr/initscripts-shr/mountdevsubfs.sh
+++ b/recipes/shr/initscripts-shr/mountdevsubfs.sh
@@ -3,9 +3,6 @@
 . /etc/default/devpts
 
 test -c /dev/ptmx || mknod -m 666 /dev/ptmx c 5 2
-test -c /dev/ttySAC0 || mknod /dev/ttySAC0 c 204 64
-test -c /dev/ttySAC1 || mknod /dev/ttySAC1 c 204 65
-test -c /dev/ttySAC2 || mknod /dev/ttySAC2 c 204 66
 
 if [ ! -d /dev/pts ]; then
         mkdir /dev/pts
diff --git a/recipes/shr/initscripts-shr_0.0.1.bb b/recipes/shr/initscripts-shr_0.0.1.bb
index bd9362a..120c325 100644
--- a/recipes/shr/initscripts-shr_0.0.1.bb
+++ b/recipes/shr/initscripts-shr_0.0.1.bb
@@ -5,7 +5,7 @@ DEPENDS = ""
 RDEPENDS_${PN} = "procps"
 LICENSE = "GPL"
 PV = "0.0.1"
-PR = "r18"
+PR = "r19"
 
 RCONFLICTS_${PN} = "initscripts"