summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-10-26 16:31:35 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-10-26 14:36:42 +0000
commit24581d461e7c9b87836384cd4c38cb2bd7147459 (patch)
tree9d1e9cafee5331b6384814f574b21f2c2683d771
parenta740425411f120ff7263f16f268e7efd7c19b311 (diff)
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>
-rw-r--r--conf.d/packaging/deb/debian.rules5
-rw-r--r--conf.d/packaging/rpm/agl-xds-server.spec3
2 files changed, 0 insertions, 8 deletions
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