diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-08 00:39:10 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-08 00:39:10 +0000 |
| commit | 45f624694b2e7601e10cae4ff957d6b42b0bc032 (patch) | |
| tree | f2c3b5e2aa8c1721a81930409ea9867eecfd4f18 /packages/opie-taskbar | |
| parent | e9bc2c07ac4628c516e2d6098f7181fb7ed2aa8d (diff) | |
opie-taskbar: init.d/opie: explicitly shut down psplash on opie start, plus
allow it some time for that. Otherwise, there's race between psplash and
opie on some machines (seen on h3900), leading to opie hang. With this change,
opie *could* run on VT 2, but it appears that opie's GUI manager has off-by-one
error, causing it to not use last screen scanline, so old content is seen
there, which is unaesthetic. So, keep running opie on VT 3, which is empty.
Diffstat (limited to 'packages/opie-taskbar')
| -rwxr-xr-x | packages/opie-taskbar/opie-taskbar/opie | 6 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_1.2.2.bb | 2 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie index b2677ddc0d..3fe4d0cdf8 100755 --- a/packages/opie-taskbar/opie-taskbar/opie +++ b/packages/opie-taskbar/opie-taskbar/opie @@ -41,6 +41,12 @@ fi case $1 in 'start') #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 + + # Turn off psplash if any - sleep is required for anti-race + if [ -e /mnt/.psplash ]; then + TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + sleep 1 + fi if [ -x "$OPIEDIR/bin/opie-login" ]; then echo Starting Opie-login.... diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index 384fbd0ec8..a5e154cfef 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 38172af970..b2992b0c28 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ |