Version bump per bug #226157. Fix bugs #177887, #211505 for baselayout2. Provide better support for multiple UPS per bug #149687. Please read the postinst about upsdrv!.

(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)

3 files changed, 109 insertions, 0 deletions

diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsd b/sys-power/nut/files/nut-2.2.2-init.d-upsd
new file mode 100755
index 000000000000..4678b3e2cf33
--- /dev/null
+++ b/sys-power/nut/files/nut-2.2.2-init.d-upsd
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsd,v 1.1 2008/06/25 02:29:04 robbat2 Exp $
+
+opts="reload"
+pidfile=/var/lib/nut/upsd.pid
+bin=/usr/sbin/upsd
+
+depend() {
+	need net
+	before upsmon
+	after upsdrv
+}
+
+start() {
+	ebegin "Starting upsd"
+	# clean up first
+	pkill -u root,nut -x ${bin}
+	sleep 1s
+	rm -f ${pidfile}
+	# now start up
+	start-stop-daemon --start --quiet --exec ${bin}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping upsd"
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading upsd"
+	start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile ${pidfile}
+	eend $?
+}
diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsdrv b/sys-power/nut/files/nut-2.2.2-init.d-upsdrv
new file mode 100755
index 000000000000..3d18e5bc3db6
--- /dev/null
+++ b/sys-power/nut/files/nut-2.2.2-init.d-upsdrv
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsdrv,v 1.1 2008/06/25 02:29:04 robbat2 Exp $
+
+opts="start stop stopall startall"
+UPSNAME=${SVCNAME#*.}
+msgtext="drivers"
+[ "${UPSNAME}" == "${SVCNAME}" ] && UPSNAME=''
+[ -n "$UPSNAME" ] && msgtext="driver for $UPSNAME"
+
+depend() {
+	before upsd
+	[ "${UPSNAME}" != '' ] && provide upsdrv
+}
+
+start() {
+	_dostart "$UPSNAME" "$msgtext"
+}
+stop() {
+	_dostop "$UPSNAME" "$msgtext"
+}
+
+startall() {
+	_dostart "" "$msgtext"
+}
+stopall() {
+	_dostop "" "$msgtext"
+}
+
+_dostart() {
+	ebegin "Starting UPS $msgtext"
+	/usr/sbin/upsdrvctl start $UPSNAME
+	eend $? "Failed to start UPS $msgtext!"
+}
+
+_dostop() {
+	# The pidfile names depend on the actual UPS name
+	# Not in our control at all
+	ebegin "Stopping UPS $msgtext"
+	/usr/sbin/upsdrvctl stop $UPSNAME
+	eend $? "Failed to stop UPS $msgtext!"
+}
diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsmon b/sys-power/nut/files/nut-2.2.2-init.d-upsmon
new file mode 100755
index 000000000000..3cb355b1ffdf
--- /dev/null
+++ b/sys-power/nut/files/nut-2.2.2-init.d-upsmon
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsmon,v 1.1 2008/06/25 02:29:04 robbat2 Exp $
+
+opts="reload"
+pidfile=/var/run/upsmon.pid
+bin=/usr/sbin/upsmon
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting upsmon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/upsmon
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping upsmon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/upsmon.pid
+	eend $?
+}
+reload() {
+	ebegin "Reloading upsd"
+	start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile ${pidfile}
+	eend $?
+}