gentoo resync : 14.07.2018

5 files changed, 100 insertions, 0 deletions

diff --git a/app-admin/metalog/files/consolelog.sh b/app-admin/metalog/files/consolelog.sh
new file mode 100644
index 000000000000..90fb38e9921a
--- /dev/null
+++ b/app-admin/metalog/files/consolelog.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# consolelog.sh
+# For metalog -- log to a console
+
+set -f
+
+. /etc/conf.d/metalog
+if [ -z "${CONSOLE}" ] ; then
+	CONSOLE="/dev/console"
+fi
+
+if [ -z "${FORMAT}" ] ; then
+	FORMAT='$1 [$2] $3'
+fi
+
+for d in ${CONSOLE} ; do
+	eval echo ${FORMAT} > ${d}
+done
+
+exit 0
diff --git a/app-admin/metalog/files/metalog-0.9-metalog-conf.patch b/app-admin/metalog/files/metalog-0.9-metalog-conf.patch
new file mode 100644
index 000000000000..efb794de5454
--- /dev/null
+++ b/app-admin/metalog/files/metalog-0.9-metalog-conf.patch
@@ -0,0 +1,11 @@
+--- a/metalog.conf
++++ b/metalog.conf
+@@ -21,6 +21,8 @@
+ # merely write $@ to some device (your console for messages):
+ # echo "$@" > /dev/tty10
+ #
++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog
++#
+ #console logging :
+ #
+ #  facility  = "*"
diff --git a/app-admin/metalog/files/metalog.confd b/app-admin/metalog/files/metalog.confd
new file mode 100644
index 000000000000..ec7e64edae2b
--- /dev/null
+++ b/app-admin/metalog/files/metalog.confd
@@ -0,0 +1,18 @@
+# /etc/conf.d/metalog
+
+# Some useful options:
+#  -a   Log with buffering
+#  -s   Log without buffering
+# See `metalog --help` for more
+
+METALOG_OPTS=""
+
+
+# Options used by /usr/sbin/consolelog.sh
+
+# Space delimited list of devices to write "console" messages to
+#CONSOLE="/dev/console /dev/tty10"
+CONSOLE="/dev/tty10"
+
+# Format of logging (make sure you use single quotes)
+FORMAT='$1 [$2] $3'
diff --git a/app-admin/metalog/files/metalog.initd b/app-admin/metalog/files/metalog.initd
new file mode 100644
index 000000000000..f81e9eec51ca
--- /dev/null
+++ b/app-admin/metalog/files/metalog.initd
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="buffer unbuffer"
+
+PIDFILE=/var/run/metalog.pid
+
+depend() {
+	need localmount
+	use clock hostname
+	after bootmisc
+	provide logger
+}
+
+ssd() { start-stop-daemon --exec /usr/sbin/metalog --pidfile "${PIDFILE}" "$@" ; }
+
+start() {
+	ebegin "Starting metalog"
+	ssd --start -- \
+	    --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping metalog"
+	ssd --stop
+	eend $?
+}
+
+buffer() {
+	ebegin "Enabling log buffering"
+	ssd --signal USR2
+	eend $?
+}
+
+unbuffer() {
+	ebegin "Disabling log buffering"
+	ssd --signal USR1
+	eend $?
+}
diff --git a/app-admin/metalog/files/metalog.service-r1 b/app-admin/metalog/files/metalog.service-r1
new file mode 100644
index 000000000000..862881aee165
--- /dev/null
+++ b/app-admin/metalog/files/metalog.service-r1
@@ -0,0 +1,10 @@
+[Unit]
+Description=System Logger Daemon
+
+[Service]
+ExecStart=/usr/sbin/metalog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=syslog.service