summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-03 17:47:53 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-03 17:47:55 +0200
commit866c50d4a927396288c37d8f59b3b8913ac49eac (patch)
tree7de3cd9f109bdb43c4dbd1d4a61a299eb319a183
parent2c925773bcc68b577f1cd614754efea83954e378 (diff)
Don't enable xds-agent service during install
Installation is processed as root (sudoer) and consequently enabling "manually" (by creating link) xds-agent service during install is not a good idea. The only viable solution is to well document how user should enable it as a user systemd service, IOW: systemctl --user enable xds-agent.service Change-Id: Iba1f3bb501c099606b53d6cf39239af499787aa7 Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--conf.d/packaging/deb/debian.rules2
-rw-r--r--conf.d/packaging/rpm/agl-xds-agent.spec4
2 files changed, 0 insertions, 6 deletions
diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules
index b768ce6..c6c7bd3 100644
--- a/conf.d/packaging/deb/debian.rules
+++ b/conf.d/packaging/deb/debian.rules
@@ -63,8 +63,6 @@ install: build
mkdir -p $(DEB_BASE_DIR)/etc/default $(DEB_BASE_DIR)/etc/xds/agent
cp $(DEB_INSTALL_XDS_DIR)/conf.d/etc/default/xds-agent $(DEB_BASE_DIR)/etc/default/
cp $(DEB_INSTALL_XDS_DIR)/conf.d/etc/xds/agent/* $(DEB_BASE_DIR)/etc/xds/agent/
- mkdir -p $(DEB_BASE_DIR)/etc/systemd/user/multi-user.target.wants
- ln -s /usr/lib/systemd/user/xds-agent.service $(DEB_BASE_DIR)/etc/systemd/user/multi-user.target.wants/
# Add XDS in user's PATH
mkdir -p $(DEB_BASE_DIR)/etc/profile.d
diff --git a/conf.d/packaging/rpm/agl-xds-agent.spec b/conf.d/packaging/rpm/agl-xds-agent.spec
index b6e3fff..0d493a4 100644
--- a/conf.d/packaging/rpm/agl-xds-agent.spec
+++ b/conf.d/packaging/rpm/agl-xds-agent.spec
@@ -42,8 +42,6 @@ cp ./conf.d/etc/default/xds-agent %{?buildroot}/%{_sysconfdir}/default/
mkdir -p %{?buildroot}/%{_sysconfdir}/xds/agent
cp ./conf.d/etc/xds/agent/* %{?buildroot}/%{_sysconfdir}/xds/agent/
-mkdir -p %{?buildroot}%{_userunitdir}/default.target.wants && ln -s ../xds-agent.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-agent.sh > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
@@ -63,8 +61,6 @@ sed -e "s;@XDS_INSTALL_BIN_DIR@;%{_bindir};g" ./conf.d/etc/profile.d/xds-agent.s
%config %{_sysconfdir}/profile.d/%{name}.sh
%dir %{_userunitdir}
%{_userunitdir}/xds-agent.service
-%dir %{_userunitdir}/default.target.wants
-%{_userunitdir}/default.target.wants/xds-agent.service
%post
if [ "$1" -ge 2 ]; then