diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-09-28 15:39:08 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-09-28 15:41:01 +0200 |
| commit | 4ae02b5b270b32d203672888ea03e357ce6ec4c6 (patch) | |
| tree | deb3d3d755bfbb5b24dc32724605a85ce9a8f13e /recipes/shr | |
| parent | dee46c3eb9f6b09ba129a75f40d7769d6f573e84 (diff) | |
| download | openembedded-4ae02b5b270b32d203672888ea03e357ce6ec4c6.tar.gz | |
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@gmail.com>
Diffstat (limited to 'recipes/shr')
| -rw-r--r-- | recipes/shr/initscripts-shr/mountall.sh | 2 | ||||
| -rw-r--r-- | recipes/shr/initscripts-shr/mountdevsubfs.sh | 3 | ||||
| -rw-r--r-- | 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 4bd7bbb02c..0bea871663 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 2a0a7a6b2e..4308dab44e 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 bd9362a56a..120c325fbf 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" |