Merge branch 'master' into harmattan

[busybox-power] / debian / busybox-power.postinst

diff --git a/debian/busybox-power.postinst b/debian/busybox-power.postinst
index e2d7c5a..da84ce5 100644 (file)
--- a/debian/busybox-power.postinst
+++ b/debian/busybox-power.postinst
@@ -15,7 +15,7 @@
 
 INSTALLDIR="/opt/busybox-power"
 EXECPWR="$INSTALLDIR/busybox.power"
-DISTBIN="/bin/busybox.distrib"
+DISTBIN="$INSTALLDIR/busybox.distrib"
 
 VERBOSE="0"
 SYMLINK="1"
@@ -71,7 +71,10 @@ ROLLBACK_HARMATTAN() {
 INSTALL() {
     case $ENVIRONMENT in
       SDK|DIABLO|FREMANTLE)
-        /usr/sbin/dpkg-divert --local --divert $DISTBIN /bin/busybox
+        # Divert in postinst instead of preinst, we don't want to leave Maemo
+        # without /bin/busybox for a short period of time
+        /usr/sbin/dpkg-divert --package busybox-power --add \
+          --divert $DISTBIN /bin/busybox
         $EXECPWR cp -f $EXECPWR /bin/busybox
         ;;
       HARMATTAN)