Merge "on-demand connman-vpnd start" into tizensubmit/tizen/20160314.010212accepted/tizen/wearable/20160314.104358accepted/tizen/tv/20160314.104344accepted/tizen/mobile/20160314.104328accepted/tizen/ivi/20160314.104418accepted/tizen/common/20160315.220804

5 files changed, 2 insertions, 40 deletions

diff --git a/Makefile.am b/Makefile.am
index 6e69fc4c..95761e24 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,17 +66,12 @@ systemdunitdir = @SYSTEMD_UNITDIR@
 
 systemdunit_DATA = src/connman.service
 
-if VPN
-systemdunit_DATA += vpn/connman-vpn.service
-endif
 endif
 endif
 
 service_files_sources = src/connman.service.in src/net.connman.service.in \
-				vpn/connman-vpn.service.in \
 				vpn/net.connman.vpn.service.in
 service_files = src/connman.service src/net.connman.service \
-				vpn/connman-vpn.service \
 				vpn/net.connman.vpn.service
 
 plugin_LTLIBRARIES =
diff --git a/packaging/connman.spec b/packaging/connman.spec
index 7f25c826..65ff351b 100755
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -168,32 +168,12 @@ mkdir -p %{buildroot}%{_datadir}/license
 cp COPYING %{buildroot}%{_datadir}/license/connman
 
 %if %{with connman_vpnd}
-#Systemd service file
-%if "%{?_lib}" == "lib64"
-cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
-%endif
-
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -s ../connman-vpn.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/connman-vpn.service
-%if "%{?_lib}" == "lib64"
-mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-ln -s ../connman-vpn.service %{buildroot}%{_unitdir}/multi-user.target.wants/connman-vpn.service
-%endif
 cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
 %endif
 
 %post
-#systemctl daemon-reload
-#systemctl restart connman.service
-%if %{with connman_vpnd}
-systemctl restart connman-vpn.service
-%endif
 
 %preun
-#systemctl stop connman.service
-%if %{with connman_vpnd}
-systemctl stop connman-vpn.service
-%endif
 
 %postun
 systemctl daemon-reload
@@ -213,13 +193,9 @@ systemctl daemon-reload
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %attr(644,root,root) %{_libdir}/systemd/system/connman.service
 %attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman.service
-%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
-%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman-vpn.service
 %if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/connman.service
 %attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman.service
-%attr(644,root,root) %{_unitdir}/connman-vpn.service
-%attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman-vpn.service
 %endif
 %{_datadir}/license/connman
 
@@ -235,7 +211,6 @@ systemctl daemon-reload
 %if %{with connman_openconnect}
 %files plugin-openconnect
 %manifest %{name}.manifest
-%{_unitdir}/connman-vpn.service
 %{_libdir}/connman/plugins-vpn/openconnect.so
 %{_libdir}/connman/scripts/openconnect-script
 %{_datadir}/dbus-1/system-services/net.connman.vpn.service
@@ -244,7 +219,6 @@ systemctl daemon-reload
 %if %{with connman_openvpn}
 %files plugin-openvpn
 %manifest %{name}.manifest
-%{_unitdir}/connman-vpn.service
 %{_libdir}/%{name}/plugins-vpn/openvpn.so
 %{_libdir}/%{name}/scripts/openvpn-script
 %{_datadir}/dbus-1/system-services/net.connman.vpn.service
@@ -254,12 +228,6 @@ systemctl daemon-reload
 %files connman-vpnd
 %manifest %{name}.manifest
 %{_sbindir}/connman-vpnd
-%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
-%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman-vpn.service
-%if "%{?_lib}" == "lib64"
-%attr(644,root,root) %{_unitdir}/connman-vpn.service
-%attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman-vpn.service
-%endif
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/scripts
 %dir %{_libdir}/%{name}/plugins-vpn
diff --git a/src/connman.service.in b/src/connman.service.in
index b55c571f..adf7a62a 100755
--- a/src/connman.service.in
+++ b/src/connman.service.in
@@ -7,7 +7,7 @@ DefaultDependencies=no
 Type=dbus
 BusName=net.connman
 Restart=on-failure
-ExecStart=@sbindir@/connmand -n
+ExecStart=@sbindir@/connmand -n --noplugin vpn
 StandardOutput=null
 
 [Install]
diff --git a/src/connman_tv.service.in b/src/connman_tv.service.in
index 43dea2ce..2922aa86 100644
--- a/src/connman_tv.service.in
+++ b/src/connman_tv.service.in
@@ -6,7 +6,7 @@ Type=dbus
 BusName=net.connman
 RemainAfterExit=yes
 ExecStartPre=/usr/bin/dbus-send --system --dest=net.netconfig / net.netconfig.auto.activate
-ExecStart=/usr/sbin/connmand
+ExecStart=/usr/sbin/connmand --noplugin vpn
 
 [Install]
 WantedBy=multi-user.target
diff --git a/vpn/net.connman.vpn.service.in b/vpn/net.connman.vpn.service.in
index e473ea9e..94872013 100755
--- a/vpn/net.connman.vpn.service.in
+++ b/vpn/net.connman.vpn.service.in
@@ -2,4 +2,3 @@
 Name=net.connman.vpn
 Exec=@sbindir@/connman-vpnd -n
 User=root
-SystemdService=connman-vpn.service