crosswalk: start xwalk service through dbus

- added dbus.service as a wanted service for user session
- removed xwalk.service from default target in user session
  xwalk should now be started through systemd dbus activation
- moved xwalk_preinstall_service to wrt-widgets
  (used to trigger wrt-widgets preinstall at first boot)
- cleanup of crosswalk postinst script: no need to append launchers
  to weston.ini

Change-Id: I9db5bd22cdd70d8ecc51b4ab506f30c2732eb1c8
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/scripts/common-base.post b/scripts/common-base.post
index e0dca6b..3c2825f 100644 (file)
--- a/scripts/common-base.post
+++ b/scripts/common-base.post
@@ -7,6 +7,9 @@ Description=User session default target
 EOF
 mkdir -p /lib/systemd/user/default.target.wants
 
+# start dbus session
+ln -s ../dbus.service /lib/systemd/user/default.target.wants/
+
 # Run prelink to speed up dynamic binary/library loading
 /usr/sbin/prelink --all
 

diff --git a/scripts/common-crosswalk.post b/scripts/common-crosswalk.post
index 071a5f7..df870df 100644 (file)
--- a/scripts/common-crosswalk.post
+++ b/scripts/common-crosswalk.post
@@ -7,26 +7,6 @@ ail_initdb
 # start wrt widgets preinstall
 prepare_widgets.sh
 
-# install widgets at first run
-cat <<EOF >/lib/systemd/user/xwalk_widgets_preinstall.service
-[Unit]
-Description=Installation of pre-installed widgets
-After=dbus.service
-ConditionPathExists=!%h/.config/xwalk-service/applications.db
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/install_widgets.sh
-
-[Install]
-WantedBy=default.target
-EOF
-
-# run xwalk and xwalk_widgets_preinstall services in default target
-mkdir -p /lib/systemd/user/default.target.wants
-ln -sf ../xwalk_widgets_preinstall.service /lib/systemd/user/default.target.wants/
-ln -sf ../xwalk.service /lib/systemd/user/default.target.wants/
-
 # add launchers to weston.ini
 if [ -f /usr/bin/weston ]; then
 
@@ -38,14 +18,6 @@ if [ -f /usr/bin/weston ]; then
 icon=/usr/share/icons/tizen/32x32/web-browser.png
 path=/usr/lib64/xwalk/xwalk http://www.google.com
 
-[launcher]
-icon=/usr/share/icons/tizen/32x32/annex.png
-path=/usr/bin/xwalk-launcher hnabpnbionlaokfnobomjleblmmiefig
-
-[launcher]
-icon=/usr/share/icons/tizen/32x32/bubblewrap.png
-path=/usr/bin/xwalk-launcher kmnbdhfbkjkeilhpbooaecgpllbollfn
-
 EOF
 
 fi