diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2018-11-10 17:08:43 -0800 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2019-03-05 15:26:37 -0800 |
| commit | eedb718206696562551762c452832acfdc523669 (patch) | |
| tree | 60c4ba73538de5f08570c010678475213d71416e /app-admin | |
| parent | sys-kernel/gentoo-sources: Linux patch 4.14.105 (diff) | |
| download | gentoo-eedb718206696562551762c452832acfdc523669.tar.gz gentoo-eedb718206696562551762c452832acfdc523669.tar.bz2 gentoo-eedb718206696562551762c452832acfdc523669.zip | |
app-admin/conserver: remove unused conserver.initd
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/conserver/conserver-8.1.18-r1.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/conserver/files/conserver.initd | 4 | ||||
| -rw-r--r-- | app-admin/conserver/files/conserver.initd-r1 | 37 |
3 files changed, 4 insertions, 41 deletions
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild index 0ab9102d365a..53a8cd7fd301 100644 --- a/app-admin/conserver/conserver-8.1.18-r1.ebuild +++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -62,7 +62,7 @@ src_install() { fperms 700 /var/consoles ## add startup and sample config - newinitd "${FILESDIR}"/conserver.initd-r1 conserver + newinitd "${FILESDIR}"/conserver.initd conserver newconfd "${FILESDIR}"/conserver.confd conserver dodir /etc/conserver diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd index 0c0771c72c6b..841892672cc2 100644 --- a/app-admin/conserver/files/conserver.initd +++ b/app-admin/conserver/files/conserver.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { @@ -25,7 +25,7 @@ checkconfig() { start() { checkconfig || return 1 ebegin "Starting conserver" - start-stop-daemon --start --quiet --exec \ + start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \ /usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null eend $? "Failed to start conserver" } diff --git a/app-admin/conserver/files/conserver.initd-r1 b/app-admin/conserver/files/conserver.initd-r1 deleted file mode 100644 index 907b1b711705..000000000000 --- a/app-admin/conserver/files/conserver.initd-r1 +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need clock -} - -checkconfig() { - if [ ! -e /etc/conserver/conserver.cf ] ; then - eerror "You need to create /etc/conserver/conserver.cf first." - eerror "A sample is placed there to be renamed and ajusted." - eerror "Read the man page or see /usr/share/doc/conserver-<version>/." - return 1 - fi - - if [ ! -e /etc/conserver/conserver.passwd ] ; then - eerror "You need to create /etc/conserver/conserver.passwd first." - eerror "A sample is placed there to be renamed and ajusted." - eerror "Read the man page or see /usr/share/doc/conserver-<version>/." - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting conserver" - start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \ - /usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null - eend $? "Failed to start conserver" -} - -stop() { - ebegin "Stopping conserver" - start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid - eend $? "Failed to stop conserver" -} |