git.openpandora.org
/
pandora-libraries.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e33d98
)
pnd_run.sh: restore fb0 too
author
Grazvydas Ignotas
<notasas@gmail.com>
Sat, 2 Mar 2013 19:57:03 +0000
(21:57 +0200)
committer
Grazvydas Ignotas
<notasas@gmail.com>
Sat, 2 Mar 2013 19:57:03 +0000
(21:57 +0200)
testdata/scripts/pnd_run.sh
patch
|
blob
|
history
diff --git
a/testdata/scripts/pnd_run.sh
b/testdata/scripts/pnd_run.sh
index
c009a3e
..
c851920
100755
(executable)
--- a/
testdata/scripts/pnd_run.sh
+++ b/
testdata/scripts/pnd_run.sh
@@
-585,6
+585,7
@@
main() {
PND_EndTask
fi
oPWD=$(pwd)
PND_EndTask
fi
oPWD=$(pwd)
+ old_fb0_geometry=$(fbset -fb /dev/fb0 -s | grep geometry | awk '{print $2, $3, $4, $5, $6}')
if [ -e "${APPDATADIR}/PND_pre_script.sh" ]; then
PND_BeginTask "Starting user configured pre-script"
. ${APPDATADIR}/PND_pre_script.sh # Sourcing so it can shared vars with post-script ;)
if [ -e "${APPDATADIR}/PND_pre_script.sh" ]; then
PND_BeginTask "Starting user configured pre-script"
. ${APPDATADIR}/PND_pre_script.sh # Sourcing so it can shared vars with post-script ;)
@@
-609,11
+610,12
@@
main() {
PND_resetCPUSpeed
PND_EndTask
fi
PND_resetCPUSpeed
PND_EndTask
fi
+ PND_BeginTask "Restoring the frame buffer status"
+ fbset -fb /dev/fb0 -g $old_fb0_geometry
if ! lsof /dev/fb1 > /dev/null; then
if ! lsof /dev/fb1 > /dev/null; then
- PND_BeginTask "Restoring the frame buffer status"
ofbset -fb /dev/fb1 -mem 0 -size 0 0 -en 0
ofbset -fb /dev/fb1 -mem 0 -size 0 0 -en 0
- PND_EndTask
fi
fi
+ PND_EndTask
PND_BeginTask "uMount the PND"
umountUnion
PND_EndTask
PND_BeginTask "uMount the PND"
umountUnion
PND_EndTask