From c4420e60fd3a82e800e97df8409c57181dd2ee0d Mon Sep 17 00:00:00 2001 From: Steven Luo Date: Fri, 27 Aug 2010 23:49:18 -0700 Subject: [PATCH] Update postinst We can now coexist with a running MicroB browser process, so don't try to kill off browser in the postinst. On the other hand, we now need browser-switchboard running at all times in order for things to work correctly (especially if there is a MicroB browser process running), so start browser-switchboard as the user. We assume the Maemo default user, since we have no good way of checking this, and on a regular device (e.g. not the SDK) it's always true. --- debian/postinst | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/postinst b/debian/postinst index 1eb18ce..0175a39 100644 --- a/debian/postinst +++ b/debian/postinst @@ -20,13 +20,9 @@ set -e case "$1" in configure) - # If there's a MicroB browser process in the background, try to kill - # it off, because it's taking com.nokia.osso_browser and preventing - # us from working - browser_pids=`pidof browser || true` - if [ ! -z "$browser_pids" ]; then - kill $browser_pids || true - fi + # Try to start browser-switchboard as the user + # XXX: we're assuming here that the user is named "user" + /bin/su - user -c "/etc/X11/Xsession.post/35browser-switchboard" || true ;; abort-upgrade|abort-remove|abort-deconfigure) -- 1.7.9.5