Don't use $opts in init.d / conf.d, bug 436066

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

5 files changed, 28 insertions, 6 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index bc5dea41da07..6ba23065ffd2 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/keepalived
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.98 2012/09/22 14:17:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.99 2012/09/25 18:19:32 idl0r Exp $
+
+*keepalived-1.2.7-r1 (25 Sep 2012)
+
+  25 Sep 2012; Christian Ruppert <idl0r@gentoo.org> -keepalived-1.2.7.ebuild,
+  +keepalived-1.2.7-r1.ebuild, files/init-keepalived, +files/keepalived.confd,
+  files/keepalived.init:
+  Don't use $opts in init.d / conf.d, bug 436066
 
 *keepalived-1.2.7 (22 Sep 2012)
 
diff --git a/sys-cluster/keepalived/files/init-keepalived b/sys-cluster/keepalived/files/init-keepalived
index a3f9db9ffee8..52917a58502d 100644
--- a/sys-cluster/keepalived/files/init-keepalived
+++ b/sys-cluster/keepalived/files/init-keepalived
@@ -1,7 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/init-keepalived,v 1.5 2012/02/28 02:31:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/init-keepalived,v 1.6 2012/09/25 18:19:32 idl0r Exp $
+
+opts="reload"
 
 depend() {
 	use logger
@@ -34,3 +36,9 @@ stop() {
 	start-stop-daemon --stop --quiet --pidfile $PIDFILE
 	eend $?
 }
+
+reload() {
+	ebegin "Reloading keepalived.conf"
+	start-stop-daemon --pidfile $PIDFILE --signal HUP
+	eend $?
+}
diff --git a/sys-cluster/keepalived/files/keepalived.confd b/sys-cluster/keepalived/files/keepalived.confd
new file mode 100644
index 000000000000..8b0f5a16296b
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.confd
@@ -0,0 +1,7 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/keepalived.confd,v 1.1 2012/09/25 18:19:32 idl0r Exp $
+
+# Keepalived options
+# Increase logging:
+#KEEPALIVED_OPTS="-D"
diff --git a/sys-cluster/keepalived/files/keepalived.init b/sys-cluster/keepalived/files/keepalived.init
index 065b464534b3..e0acc85e74d9 100644
--- a/sys-cluster/keepalived/files/keepalived.init
+++ b/sys-cluster/keepalived/files/keepalived.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/keepalived.init,v 1.1 2012/09/22 14:17:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/keepalived.init,v 1.2 2012/09/25 18:19:32 idl0r Exp $
 
 depend() {
 	use logger
@@ -10,7 +10,7 @@ depend() {
 }
 
 command="/usr/sbin/keepalived"
-command_args="${opts}"
+command_args="${KEEPALIVED_OPTS}"
 pidfile="/var/run/keepalived.pid"
 
 extra_commands="checkconfig"
diff --git a/sys-cluster/keepalived/keepalived-1.2.7.ebuild b/sys-cluster/keepalived/keepalived-1.2.7-r1.ebuild
index a80425456ebc..8015d8258381 100644
--- a/sys-cluster/keepalived/keepalived-1.2.7.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.7.ebuild,v 1.1 2012/09/22 14:17:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.7-r1.ebuild,v 1.1 2012/09/25 18:19:32 idl0r Exp $
 
 EAPI=4
 
@@ -49,7 +49,7 @@ src_install() {
 	default
 
 	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/conf-keepalived keepalived
+	newconfd "${FILESDIR}"/keepalived.confd keepalived
 
 	use snmp && dodoc doc/KEEPALIVED-MIB