4 files changed, 26 insertions, 26 deletions
diff --git a/net-wireless/kismet/files/kismet.confd-r1 b/net-wireless/kismet/files/kismet.confd-r1
deleted file mode 100644
index 42f617372ff5..000000000000
--- a/net-wireless/kismet/files/kismet.confd-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
-
-# Kismet configuration is done in /etc/kismet*.conf
-# It is recommended to put user config in /etc/kismet_site.conf
-# where kismet updates won't try to overwrite it.
-
-# To use the kismet init script, you must have "logtemplate" set to a location
-# that is writable by the user assigned by "suiduser".
-# e.g.
-# suiduser=foo
-# logtemplate=%h/kismet_log/%n-%d-%i.%l
-
-# Options to pass to kismet, see `kismet --help`
-KISMET_SERVER_OPTIONS="--no-ncurses"
diff --git a/net-wireless/kismet/files/kismet.confd-r2 b/net-wireless/kismet/files/kismet.confd-r2
new file mode 100644
index 000000000000..40da851cbf00
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.confd-r2
@@ -0,0 +1,11 @@
+# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
+
+# Kismet configuration is done in /etc/kismet/kismet_site.conf
+
+# To use the kismet init script, you must have "logtemplate" set to a location
+# e.g.
+# log_template=%h/kismet_log/%n-%d-%i.%l
+
+# Options to pass to kismet_server, see `kismet --help`
+# --no-ncurses is passed unconditionally
+KISMET_SERVER_OPTIONS=""
diff --git a/net-wireless/kismet/files/kismet.initd-r1 b/net-wireless/kismet/files/kismet.initd-r2
index 4c1891611967..bc4374e68016 100644
--- a/net-wireless/kismet/files/kismet.initd-r1
+++ b/net-wireless/kismet/files/kismet.initd-r2
@@ -2,25 +2,17 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-checkconfig() {
-	if [ ! -e /etc/kismet.conf ]; then
-		eerror "Configuration file /etc/kismet.conf not found"
-		return 1
-	fi
-}
-
 start() {
-	checkconfig || return 1
-
-	ebegin "Starting kismet server"
+	ebegin "Starting kismet"
 	start-stop-daemon --start --quiet --pidfile /run/kismet.pid \
 		--background --make-pidfile --exec /usr/bin/kismet \
-		-- ${KISMET_SERVER_OPTIONS}
+    -1 /var/log/kismet.log -2 /var/log/kismet.log \
+		-- --no-ncurses ${KISMET_SERVER_OPTIONS}
 	eend ${?}
 }
 
 stop() {
-	ebegin "Stopping kismet server"
+	ebegin "Stopping kismet"
 	start-stop-daemon --stop --quiet --pidfile /run/kismet.pid
 	eend ${?}
 }
diff --git a/net-wireless/kismet/files/kismet.initd-r3 b/net-wireless/kismet/files/kismet.initd-r3
new file mode 100644
index 000000000000..dce3158973f7
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.initd-r3
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="kismet"
+command="/usr/bin/kismet"
+command_args="--no-ncurses ${KISMET_SERVER_OPTIONS}"
+supervisor="supervise-daemon"
+output_log="/var/log/kismet.log"
+error_log="${output_log}"
+pidfile="/run/kismet.pid"