pnd_run.sh: fix an issue with multiple mounts/bad mtab

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

diff --git a/testdata/scripts/pnd_run.sh b/testdata/scripts/pnd_run.sh
index c6cdc9b..06198aa 100755 (executable)
--- a/testdata/scripts/pnd_run.sh
+++ b/testdata/scripts/pnd_run.sh
@@ -360,10 +360,10 @@ mountPnd() {
 
        # For backward compatibility
        if [[ "$MOUNT_TARGET" != "$PND_MOUNT_DIR" ]];then
-               if [ -d "$PND_MOUNT_DIR/$PND_NAME" ];then
-                       rmdir "$PND_MOUNT_DIR/$PND_NAME"
-               else
+               if [ -h "$PND_MOUNT_DIR/$PND_NAME" ];then
                        rm "$PND_MOUNT_DIR/$PND_NAME"
+               else
+                       rmdir "$PND_MOUNT_DIR/$PND_NAME"
                fi
                if [ ! -e "$PND_MOUNT_DIR/$PND_NAME" ];then
                        ln -s "$MOUNT_TARGET/$PND_NAME" "$PND_MOUNT_DIR/$PND_NAME"
@@ -729,7 +729,7 @@ elif [ ! -d "$MOUNTPOINT" ]; then
 fi
 [ ! -z $APPDATASET ] || [ -z ${MOUNTPOINT} ] && APPDATADIR=${APPDATADIR:-$(dirname $PND)/$PND_NAME}
 APPDATADIR=${APPDATADIR:-${MOUNTPOINT}/pandora/appdata/${PND_NAME}}
-APPDD_FSTYPE=$(mount|awk '$3=="'${MOUNTPOINT}'"{print $5}')
+APPDD_FSTYPE=$(cat /proc/mounts | awk '$2=="'${MOUNTPOINT}'"{print $3}' | head -1)
 CPUSPEED_FILE=${MOUNTPOINT}/pandora/appdata/${PND_NAME}/cpuspeed
 if [ -f "$CPUSPEED_FILE" ]; then
        PND_CPUSPEED=$(cat "$CPUSPEED_FILE")