pndevmapperd: support multiple charge devices

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

diff --git a/testdata/scripts/pnd_run.sh b/testdata/scripts/pnd_run.sh
index c3562ea..c009a3e 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}"
                                ;;
                        *)
@@ -537,6 +537,8 @@ runApp() {
        fi
 
        export XDG_CONFIG_HOME="$UNION_MOUNT_DIR/$PND_NAME"
+       export REAL_HOME="$HOME"
+       export HOME="$UNION_MOUNT_DIR/$PND_NAME"
 
        if echo "$EXENAME"|grep -q ^\.\/;then
                "$EXENAME" $ARGUMENTS
@@ -551,6 +553,7 @@ runApp() {
                sleep 10s
                PID=`pidof -o %PPID -x \"$EXENAME\"`
        done
+       export HOME="$REAL_HOME"
        return $RC
 }
 
@@ -606,6 +609,11 @@ main() {
                        PND_resetCPUSpeed
                        PND_EndTask
                fi
+               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_BeginTask "uMount the PND"
                umountUnion
                PND_EndTask