From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Fri, 26 Oct 2018 14:31:35 +0000 (+0200)
Subject: Removed incorrect setting for systemd service
X-Git-Tag: 6.99.1~4
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=refs%2Fchanges%2F71%2F17471%2F2

Removed incorrect setting for systemd service

xds-server.service aims to be a user systemd service. So the user
must enable/disable/start/stop xds-server.service user systemd service
manually using for example following commands:
 systemctl --user enable xds-server.service
 systemctl --user start xds-server.service

Change-Id: Ia5cbcb684f07843c4b774bb5666c01f659af6b3d
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
---

diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules
index 2be0c7e..b6038e6 100644
--- a/conf.d/packaging/deb/debian.rules
+++ b/conf.d/packaging/deb/debian.rules
@@ -66,14 +66,9 @@ install: build
 	mkdir -p $(DEB_BASE_DIR)/etc/default $(DEB_BASE_DIR)/etc/xds/server
 	cp $(DEB_INSTALL_XDS_DIR)/conf.d/etc/default/xds-server $(DEB_BASE_DIR)/etc/default/
 	cp $(DEB_INSTALL_XDS_DIR)/conf.d/etc/xds/server/* $(DEB_BASE_DIR)/etc/xds/server/
-	mkdir -p $(DEB_BASE_DIR)/etc/systemd/user/multi-user.target.wants
-	ln -s /usr/lib/systemd/user/xds-server.service $(DEB_BASE_DIR)/etc/systemd/user/multi-user.target.wants/
 	mkdir -p $(DEB_BASE_DIR)/etc/profile.d
 	sed -e "s;@XDS_INSTALL_BIN_DIR@;$(INSTALL_BIN_DIR);g" $(DEB_INSTALL_XDS_DIR)/conf.d/etc/profile.d/xds-server.sh > $(DEB_BASE_DIR)/etc/profile.d/$(NAME).sh
 
-	# Auto-enable xds-server systemd service
-	mkdir -p $(DEB_BASE_DIR)/usr/lib/systemd/user/default.target.wants && ln -s ../xds-server.service $(DEB_BASE_DIR)/usr/lib/systemd/user/default.target.wants/
-
 	# Cleanup
 	rm -rf $(DEB_INSTALL_XDS_DIR)/conf.d
 
diff --git a/conf.d/packaging/rpm/agl-xds-server.spec b/conf.d/packaging/rpm/agl-xds-server.spec
index 25a6515..27d8d6b 100644
--- a/conf.d/packaging/rpm/agl-xds-server.spec
+++ b/conf.d/packaging/rpm/agl-xds-server.spec
@@ -42,7 +42,6 @@ mkdir -p %{?buildroot}/%{_sysconfdir}/default
 cp ./conf.d/etc/default/xds-server %{?buildroot}/%{_sysconfdir}/default/
 mkdir -p %{?buildroot}/%{_sysconfdir}/xds/server
 cp ./conf.d/etc/xds/server/* %{?buildroot}/%{_sysconfdir}/xds/server/
-mkdir -p %{?buildroot}%{_userunitdir}/default.target.wants && ln -s ../xds-server.service %{?buildroot}%{_userunitdir}/default.target.wants/
 mkdir -p %{?buildroot}%{_sysconfdir}/profile.d
 sed -e "s;@XDS_INSTALL_BIN_DIR@;%{_bindir};g" ./conf.d/etc/profile.d/xds-server.sh > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
 
@@ -63,8 +62,6 @@ sed -e "s;@XDS_INSTALL_BIN_DIR@;%{_bindir};g" ./conf.d/etc/profile.d/xds-server.
 %config %{_sysconfdir}/profile.d/%{name}.sh
 %dir %{_userunitdir}
 %{_userunitdir}/xds-server.service
-%dir %{_userunitdir}/default.target.wants
-%{_userunitdir}/default.target.wants/xds-server.service
 
 
 %post