add buffer/unbuffer funcs to init.d #81249 by Patrick Benoit

Package-Manager: portage-2.0.51.19

4 files changed, 64 insertions, 35 deletions

diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index be44d231af7a..98af3cbefd69 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 150d2958c374c05e33ed1572cf9e038e metalog-0.8_rc1.ebuild 1392
-MD5 30a64f82834b4e5880316bde9432a57e metalog-0.7-r1.ebuild 1271
-MD5 50d1dd817d7034c47499d28d22146efa metalog-0.8_pre20031130.ebuild 1453
 MD5 3bc583582883ba48358d308abd795bb8 ChangeLog 4529
 MD5 526548988af84261b9b51be9497173cc metadata.xml 352
-MD5 d34f8927d9b4943572de23e6300a189a files/metalog.confd 503
+MD5 30a64f82834b4e5880316bde9432a57e metalog-0.7-r1.ebuild 1271
+MD5 50d1dd817d7034c47499d28d22146efa metalog-0.8_pre20031130.ebuild 1453
+MD5 41c7414c1491ff0ef859d99452671840 metalog-0.8_rc1.ebuild 1401
+MD5 2a4834a861e0ed954124316c2a0ad8e9 files/consolelog.sh 191
+MD5 5a0744b717ffc52652f0f05ef0acad32 files/metalog.rc7 741
+MD5 46e8dbe8b0c2eb41e70e839dd799eca8 files/digest-metalog-0.8_rc1 67
+MD5 ab769042aa4721d0ac745943e00c70e4 files/digest-metalog-0.7-r1 63
 MD5 d16762a967c2f400ba4876a942d16d08 files/digest-metalog-0.8_pre20031130 74
 MD5 11665b7995cc4ca104d7d8c1c94db226 files/metalog.conf 1715
+MD5 6ddd7e03c45fb6d65bbac1dbeb91869d files/metalog.confd 264
 MD5 1340f1bb658ce93a963a7a833a05919a files/metalog.rc6 661
-MD5 ab769042aa4721d0ac745943e00c70e4 files/digest-metalog-0.7-r1 63
-MD5 46e8dbe8b0c2eb41e70e839dd799eca8 files/digest-metalog-0.8_rc1 67
-MD5 2a4834a861e0ed954124316c2a0ad8e9 files/consolelog.sh 191
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCALn6EZCkKN40op4RAizVAKCHX0Xpjsgdh0a4bmQ2+NqFgXDjwACdG5M8
-fU//MNHVUhig297BKynczJU=
-=C0Ld
------END PGP SIGNATURE-----
diff --git a/app-admin/metalog/files/metalog.confd b/app-admin/metalog/files/metalog.confd
index 11ca376a8650..ea7a42d6da69 100644
--- a/app-admin/metalog/files/metalog.confd
+++ b/app-admin/metalog/files/metalog.confd
@@ -1,13 +1,9 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.confd,v 1.5 2004/07/14 21:14:39 agriffis Exp $
+# /etc/conf.d/metalog
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.confd,v 1.6 2005/03/15 03:21:34 vapier Exp $
 
-# Config file for /etc/init.d/metalog
+# Some useful options:
+#  -a   Log with buffering
+#  -s   Log without buffering
+# See `metalog --help` for more
 
-# If you are using metalog 0.6, buffering is on by default.
-# Add '-s' if you dont want buffering.  (See things realtime)
-
-# If you are using metalog 0.7+, buffering is now off by default.
-# Add '-a' if you want buffering.
-
-METALOG_OPTS="-B"
+METALOG_OPTS=""
diff --git a/app-admin/metalog/files/metalog.rc7 b/app-admin/metalog/files/metalog.rc7
new file mode 100755
index 000000000000..a1953991ac5f
--- /dev/null
+++ b/app-admin/metalog/files/metalog.rc7
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.rc7,v 1.1 2005/03/15 03:21:34 vapier Exp $
+
+opts="buffer unbuffer"
+
+PIDFILE=/var/run/metalog.pid
+
+depend() {
+	need clock hostname
+	provide logger
+}
+
+start() {
+	ebegin "Starting metalog"
+	/usr/sbin/metalog \
+		--daemonize \
+		--pidfile=${PIDFILE} \
+		${METALOG_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping metalog"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend $?
+}
+
+buffer() {
+	ebegin "Enabling log buffering"
+	kill -USR1 $(<${PIDFILE})
+	eend $?
+}
+
+unbuffer() {
+	ebegin "Disabling log buffering"
+	kill -USR2 $(<${PIDFILE})
+	eend $?
+}
diff --git a/app-admin/metalog/metalog-0.8_rc1.ebuild b/app-admin/metalog/metalog-0.8_rc1.ebuild
index ad77f6e5db8a..a7cfa6837896 100644
--- a/app-admin/metalog/metalog-0.8_rc1.ebuild
+++ b/app-admin/metalog/metalog-0.8_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.8_rc1.ebuild,v 1.1 2005/02/02 11:29:16 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.8_rc1.ebuild,v 1.2 2005/03/15 03:21:34 vapier Exp $
 
 inherit versionator
 
@@ -19,7 +19,8 @@ DEPEND=">=dev-libs/libpcre-3.4"
 PROVIDE="virtual/logger"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd "${S}"
 	sed -i "s:/metalog.conf:/metalog/metalog.conf:g" \
 		src/metalog.h || die "sed metalog.h failed"
 	sed -i "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
@@ -27,18 +28,19 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
 	dodoc AUTHORS ChangeLog README NEWS TODO
 	newdoc metalog.conf metalog.conf.sample
 
-	insinto /etc/metalog ; doins ${FILESDIR}/metalog.conf
+	insinto /etc/metalog
+	doins "${FILESDIR}"/metalog.conf
 
-	newinitd ${FILESDIR}/metalog.rc6 metalog
-	newconfd ${FILESDIR}/metalog.confd metalog
+	newinitd "${FILESDIR}"/metalog.rc7 metalog
+	newconfd "${FILESDIR}"/metalog.confd metalog
 
 	exeinto /usr/sbin
-	doexe ${FILESDIR}/consolelog.sh
+	doexe "${FILESDIR}"/consolelog.sh
 }
 
 pkg_postinst() {