jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

instfiles: init.d/xrdp shouldn't be installed on systemd system

Browse Source 
On systemd system, at least CentOS 7, `service foo start` command
works as wrapper of `systemctl start foo`.  However, xrdp installs
init script into /etc/init.d/xrdp.  This script is not necessary
for systemd system, and, what is worse,  if init.d/xrdp exists,
`service xrdp start` works as wrapper to run init.d/xrdp. Maybe
this is inconvinient for many users.
This commit is contained in:
Koichiro IWAO 2015-04-13 11:50:39 +09:00
parent b55231f18a
commit ea0aba4ae3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
instfiles/Makefile.am
View File

@ -4,7 +4,6 @@ xrdp.service
SUBDIRS = \
pam.d \
init.d \
default \
pulse
@ -12,6 +11,9 @@ if HAVE_SYSTEMD
systemdsystemunit_DATA = \
xrdp-sesman.service \
xrdp.service
else
SUBDIRS+=
init.d
endif
startscriptdir=$(sysconfdir)/xrdp
@ -34,5 +36,7 @@ startscript_DATA = \
# must be tab below
install-data-hook:
chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp
sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp;
if [ -f $(DESTDIR)$(sysconfdir)/init.d/xrdp ]; then \
chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
fi

2
instfiles/init.d/Makefile.am
View File

@ -1,4 +1,4 @@
EXTRA_DIST = xrdp
startscriptdir=$(sysconfdir)/init.d
startscript_DATA = xrdp