1 files changed, 9 insertions, 2 deletions

diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
index 95dccb9cae..1f3e692029 100755
--- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
+++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
@@ -81,11 +81,18 @@ remove_rcsd_link=1
 if $pm_installed; then
         case $pm in
                 "ipk")
-                        eval opkg configure $append_log
+                        if ! `fcntl-lock --wait 30 /run/opkg.lock true`; then
+                                eval echo "Unable to obtain the opkg lock, deadlock?" $append_log
+                        fi
+                        if ! eval "opkg configure $append_log"; then
+                            exit 1
+                        fi
                         ;;
 
                 "deb")
-                        eval dpkg --configure -a $append_log
+                        if ! eval "eval dpkg --configure -a $append_log"; then
+                            exit 1
+                        fi
                         ;;
         esac
 else