pnd_run.sh: restore fb0 too

[pandora-libraries.git] / testdata / scripts / pnd_run.sh

diff --git a/testdata/scripts/pnd_run.sh b/testdata/scripts/pnd_run.sh
index 2b52416..c851920 100755 (executable)
--- a/testdata/scripts/pnd_run.sh
+++ b/testdata/scripts/pnd_run.sh
@@ -314,8 +314,8 @@ mountPnd() {
                        #detect fs
                        case $PND_FSTYPE in
                        ISO)
-                               /sbin/losetup $FREELOOP "$PND" #attach the pnd to the loop device
-                               mntline="mount" #setup the mountline for later
+                               /sbin/losetup -r $FREELOOP "$PND" #attach the pnd to the loop device
+                               mntline="mount -o ro" #setup the mountline for later
                                mntdev="${FREELOOP}"
                                ;;
                        directory)
@@ -325,8 +325,8 @@ mountPnd() {
                                mntdev="${PND}"
                                ;;
                        Squashfs)
-                               /sbin/losetup $FREELOOP "$PND" #attach the pnd to the loop device
-                               mntline="mount -t squashfs"
+                               /sbin/losetup -r $FREELOOP "$PND" #attach the pnd to the loop device
+                               mntline="mount -t squashfs -o ro"
                                mntdev="${FREELOOP}"
                                ;;
                        *)
@@ -585,6 +585,7 @@ main() {
                        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 ;)
@@ -609,11 +610,12 @@ main() {
                        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
-                       PND_BeginTask "Restoring the frame buffer status"
                        ofbset -fb /dev/fb1 -mem 0 -size 0 0 -en 0
-                       PND_EndTask
                fi
+               PND_EndTask
                PND_BeginTask "uMount the PND"
                umountUnion
                PND_EndTask