[systemd upgrade] merge from devel_systemd branch of RSA

Improve path dependency

According to manual RequiresMountsFor "Automatically adds dependencies
of type Requires= and After= for all mount units required to access the
specified path." Current solution will fail, if mount units are changed.

Conflicts:
	packaging/vconf-setup.service
	packaging/vconf.changes

Change-Id: I12a65bfbf5042b45d6f62862da20c9818db8af98
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>

diff --git a/packaging/vconf-setup.service b/packaging/vconf-setup.service
index 219a2e48dc6b0dca54b1b9463e50eb2824d920c6..cd75eddfffc2f6daf1287056cd4fa2fb5ffbe532 100755 (executable)
--- a/packaging/vconf-setup.service
+++ b/packaging/vconf-setup.service
@@ -1,9 +1,8 @@
-
 [Unit]
 Description=Initialize the VConf storage
 DefaultDependencies=no
+RequiresMountsFor=/var/run /opt
 Before=basic.target
-After=local-fs.target
 
 [Service]
 Type=oneshot
@@ -11,4 +10,3 @@ ExecStart=/etc/rc.d/init.d/vconf-init
 
 [Install]
 WantedBy=basic.target
-

diff --git a/packaging/vconf.changes b/packaging/vconf.changes
index 59cbf1d2953f92aa79fdf9e1cb1da4bd2833bf34..3ed445321e3bea11d0884ac773e50bb9efd69625 100644 (file)
--- a/packaging/vconf.changes
+++ b/packaging/vconf.changes
@@ -1,3 +1,6 @@
+* Wed Jun 26 2013 Maciej Wereski <m.wereski@partner.samsung.com>
+- Improve path dependency
+
 * Fri Jul 05 2013 Junfeng Dong <junfeng.dong@intel.com> accepted/tizen/20130627.194918@56c355e
 - make vconf-setup service after local-fs.target