2 files changed, 2 insertions, 39 deletions
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"
-}