diff -Naur init.d-original/acct init.d-fixed/acct
--- init.d-original/acct	2011-01-27 06:18:13.000000000 +0200
+++ init.d-fixed/acct	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd-r1,v 1.1 2011/01/26 05:36:22 jer Exp $
 
-opts="report reload"
+extra_commands="report reload"
 
 depend() {
     need localmount
diff -Naur init.d-original/acpid init.d-fixed/acpid
--- init.d-original/acpid	2010-06-24 09:55:17.000000000 +0300
+++ init.d-fixed/acpid	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.3-init.d,v 1.1 2010/04/04 16:39:09 ssuominen Exp $
 
-opts="reload"
+extra_commands="reload"
 
 depend() {
 	need localmount
diff -Naur init.d-original/alsasound init.d-fixed/alsasound
--- init.d-original/alsasound	2011-05-06 04:15:45.000000000 +0300
+++ init.d-fixed/alsasound	2011-09-02 12:20:57.000000000 +0300
@@ -6,7 +6,7 @@
 alsastatedir=/var/lib/alsa
 alsascrdir=/etc/alsa.d
 
-opts="save restore"
+extra_commands="save restore"
 
 depend() {
 	need localmount
diff -Naur init.d-original/atd init.d-fixed/atd
--- init.d-original/atd	2011-09-02 09:30:15.000000000 +0300
+++ init.d-fixed/atd	2011-09-02 13:12:16.000000000 +0300
@@ -10,8 +10,7 @@
 start() {
 	ebegin "Starting atd"
 	start-stop-daemon --start --quiet --pidfile /var/run/atd.pid \
-#		--startas /usr/sbin/atd -- ${ATD_OPTS}
-		--exec /usr/sbin/atd -- ${ATD_OPTS}
+		--start --exec /usr/sbin/atd -- ${ATD_OPTS}
 	eend $?
 }
 
diff -Naur init.d-original/avahi-daemon init.d-fixed/avahi-daemon
--- init.d-original/avahi-daemon	2011-08-31 13:29:30.000000000 +0300
+++ init.d-fixed/avahi-daemon	2011-09-02 12:20:57.000000000 +0300
@@ -2,7 +2,7 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-opts="reload"
+extra_commands="reload"
 
 depend() {
 	before netmount nfsmount
diff -Naur init.d-original/avahi-dnsconfd init.d-fixed/avahi-dnsconfd
--- init.d-original/avahi-dnsconfd	2011-08-31 13:29:30.000000000 +0300
+++ init.d-fixed/avahi-dnsconfd	2011-09-02 12:20:57.000000000 +0300
@@ -2,7 +2,7 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-opts="reload"
+extra_commands="reload"
 
 depend() {
 	need avahi-daemon
diff -Naur init.d-original/dbus init.d-fixed/dbus
--- init.d-original/dbus	2011-08-06 07:16:01.000000000 +0300
+++ init.d-fixed/dbus	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.4 2007/04/04 13:35:25 cardoe Exp $
 
-opts="reload"
+extra_commands="reload"
 
 depend() {
 	need localmount
diff -Naur init.d-original/dhcpd init.d-fixed/dhcpd
--- init.d-original/dhcpd	2011-06-23 16:04:21.000000000 +0300
+++ init.d-fixed/dhcpd	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init3,v 1.1 2011/03/05 23:59:20 vapier Exp $
 
-opts="configtest"
+extra_commands="configtest"
 
 DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/${SVCNAME}.conf}
 
diff -Naur init.d-original/iptables init.d-fixed/iptables
--- init.d-original/iptables	2011-06-10 11:24:40.000000000 +0300
+++ init.d-fixed/iptables	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.3.2.init,v 1.6 2007/03/12 21:49:04 vapier Exp $
 
-opts="save reload panic"
+extra_commands="save reload panic"
 
 iptables_name=${SVCNAME}
 if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
diff -Naur init.d-original/mtab init.d-fixed/mtab
--- init.d-original/mtab	2011-09-02 07:43:21.000000000 +0300
+++ init.d-fixed/mtab	2011-09-02 13:04:41.000000000 +0300
@@ -12,7 +12,7 @@
 
 start()
 {
-	if [ -l /etc/mtab ]
+	if [ -L  /etc/mtab ]
 	then
 		einfo "Skipping mtab update (mtab is a symbolic link)"
 		return 0
diff -Naur init.d-original/net.br0 init.d-fixed/net.br0
--- init.d-original/net.br0	2011-09-02 07:43:21.000000000 +0300
+++ init.d-fixed/net.br0	2011-09-02 12:20:57.000000000 +0300
@@ -662,7 +662,7 @@
 stop()
 {
 	local IFACE=${RC_SVCNAME#*.} module=
-	local IFVAR=$(shell_var "${IFACE}") opts=
+	local IFVAR=$(shell_var "${IFACE}") extra_commands=
 
 	einfo "Bringing down interface ${IFACE}"
 	eindent
diff -Naur init.d-original/net.eth0 init.d-fixed/net.eth0
--- init.d-original/net.eth0	2011-09-02 07:43:21.000000000 +0300
+++ init.d-fixed/net.eth0	2011-09-02 12:20:57.000000000 +0300
@@ -662,7 +662,7 @@
 stop()
 {
 	local IFACE=${RC_SVCNAME#*.} module=
-	local IFVAR=$(shell_var "${IFACE}") opts=
+	local IFVAR=$(shell_var "${IFACE}") extra_commands=
 
 	einfo "Bringing down interface ${IFACE}"
 	eindent
diff -Naur init.d-original/net.lo init.d-fixed/net.lo
--- init.d-original/net.lo	2011-09-02 07:43:21.000000000 +0300
+++ init.d-fixed/net.lo	2011-09-02 12:20:57.000000000 +0300
@@ -662,7 +662,7 @@
 stop()
 {
 	local IFACE=${RC_SVCNAME#*.} module=
-	local IFVAR=$(shell_var "${IFACE}") opts=
+	local IFVAR=$(shell_var "${IFACE}") extra_commands=
 
 	einfo "Bringing down interface ${IFACE}"
 	eindent
diff -Naur init.d-original/netmount init.d-fixed/netmount
--- init.d-original/netmount	2011-09-02 07:43:21.000000000 +0300
+++ init.d-fixed/netmount	2011-09-02 12:20:57.000000000 +0300
@@ -6,12 +6,12 @@
 
 need_portmap()
 {
-	local opts=
+	local extra_commands=
 	local IFS="
 "
 	set -- $(fstabinfo --options --fstype nfs,nfs4)
-	for opts; do
-		case ,$opts, in
+	for extra_commands; do
+		case ,$extra_commands, in
 			*,noauto,*|*,nolock,*);;
 			*) return 0;;
 		esac
diff -Naur init.d-original/net.tap0 init.d-fixed/net.tap0
--- init.d-original/net.tap0	2011-09-02 07:43:21.000000000 +0300
+++ init.d-fixed/net.tap0	2011-09-02 12:20:57.000000000 +0300
@@ -662,7 +662,7 @@
 stop()
 {
 	local IFACE=${RC_SVCNAME#*.} module=
-	local IFVAR=$(shell_var "${IFACE}") opts=
+	local IFVAR=$(shell_var "${IFACE}") extra_commands=
 
 	einfo "Bringing down interface ${IFACE}"
 	eindent
diff -Naur init.d-original/net.tap1 init.d-fixed/net.tap1
--- init.d-original/net.tap1	2011-09-02 07:43:21.000000000 +0300
+++ init.d-fixed/net.tap1	2011-09-02 12:20:57.000000000 +0300
@@ -662,7 +662,7 @@
 stop()
 {
 	local IFACE=${RC_SVCNAME#*.} module=
-	local IFVAR=$(shell_var "${IFACE}") opts=
+	local IFVAR=$(shell_var "${IFACE}") extra_commands=
 
 	einfo "Bringing down interface ${IFACE}"
 	eindent
diff -Naur init.d-original/nfs init.d-fixed/nfs
--- init.d-original/nfs	2011-09-01 21:23:26.000000000 +0300
+++ init.d-fixed/nfs	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.25 2011/09/01 15:18:01 vapier Exp $
 
-opts="reload"
+extra_commands="reload"
 
 # This variable is used for controlling whether or not to run exportfs -ua;
 # see stop() for more information
diff -Naur init.d-original/reboot.sh init.d-fixed/reboot.sh
--- init.d-original/reboot.sh	2011-08-30 04:08:59.000000000 +0300
+++ init.d-fixed/reboot.sh	2011-09-02 12:20:57.000000000 +0300
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-opts="-dpk"
-[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i"
+extra_commands="-dpk"
+[ "${RC_DOWN_INTERFACE}" = "yes" ] && extra_commands="${extra_commands}i"
 
-/sbin/reboot "${opts}" 2>/dev/null
+/sbin/reboot "${extra_commands}" 2>/dev/null
 
 # hmm, if the above failed, that's kind of odd ...
 # so let's force a reboot
diff -Naur init.d-original/samba init.d-fixed/samba
--- init.d-original/samba	2011-08-10 12:50:15.000000000 +0300
+++ init.d-fixed/samba	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.1 2011/06/30 15:50:28 dagger Exp $
 
-opts="reload"
+extra_commands="reload"
 
 depend() {
 	after slapd
diff -Naur init.d-original/shutdown.sh init.d-fixed/shutdown.sh
--- init.d-original/shutdown.sh	2011-08-30 04:08:59.000000000 +0300
+++ init.d-fixed/shutdown.sh	2011-09-02 12:20:57.000000000 +0300
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-opts="-d"
-[ "${INIT_HALT}" != "HALT" ] && opts="${opts}p"
-[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i"
-[ "${RC_DOWN_HARDDISK}" = "yes" ] && opts="${opts}h"
+extra_commands="-d"
+[ "${INIT_HALT}" != "HALT" ] && extra_commands="${extra_commands}p"
+[ "${RC_DOWN_INTERFACE}" = "yes" ] && extra_commands="${extra_commands}i"
+[ "${RC_DOWN_HARDDISK}" = "yes" ] && extra_commands="${extra_commands}h"
 
-/sbin/halt "${opts}"
+/sbin/halt "${extra_commands}"
 
 # hmm, if the above failed, that's kind of odd ...
 # so let's force a halt
diff -Naur init.d-original/smartd init.d-fixed/smartd
--- init.d-original/smartd	2011-06-14 11:53:01.000000000 +0300
+++ init.d-fixed/smartd	2011-09-02 12:20:57.000000000 +0300
@@ -8,7 +8,7 @@
     after bootmisc
 }
 
-opts="${opts} reload"
+extra_commands="${extra_commands} reload"
 
 checkconfig() {
 	if [ ! -f "/etc/smartd.conf" ] ; then
diff -Naur init.d-original/spindownd init.d-fixed/spindownd
--- init.d-original/spindownd	2009-08-06 06:28:42.000000000 +0300
+++ init.d-fixed/spindownd	2011-09-02 12:20:57.000000000 +0300
@@ -9,8 +9,8 @@
 SPINDOWND_CFG=${SPINDOWND_CFG:-/etc/spindown.conf}
 PIDPATH=${PIDPATH:-/var/run/spindownd.pid}
 
-# opts="reload stats"
-opts="${opts} reload"
+# extra_commands="reload stats"
+extra_commands="${extra_commands} reload"
 
 
 depend() {
diff -Naur init.d-original/sshd init.d-fixed/sshd
--- init.d-original/sshd	2011-05-10 06:06:06.000000000 +0300
+++ init.d-fixed/sshd	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.2,v 1.1 2011/01/24 02:55:47 vapier Exp $
 
-opts="${opts} reload checkconfig gen_keys"
+extra_commands="${extra_commands} reload checkconfig gen_keys"
 
 depend() {
 	use logger dns
diff -Naur init.d-original/syslog-ng init.d-fixed/syslog-ng
--- init.d-original/syslog-ng	2011-05-09 04:44:13.000000000 +0300
+++ init.d-fixed/syslog-ng	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6.3,v 1.1 2010/04/06 02:11:35 mr_bones_ Exp $
 
-opts="checkconfig reload"
+extra_commands="checkconfig reload"
 
 depend() {
 	# Make networking dependency conditional on configuration
diff -Naur init.d-original/tor init.d-fixed/tor
--- init.d-original/tor	2011-09-01 19:51:38.000000000 +0300
+++ init.d-fixed/tor	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.3 2011/09/01 15:56:56 blueness Exp $
 
-opts="${opts} checkconfig checkvarrun reload"
+extra_commands="${extra_commands} checkconfig checkvarrun reload"
 PIDDIR="/var/run/tor"
 PIDFILE="${PIDDIR}/tor.pid"
 CONFFILE="/etc/tor/torrc"
diff -Naur init.d-original/udev init.d-fixed/udev
--- init.d-original/udev	2011-07-12 12:14:53.000000000 +0300
+++ init.d-fixed/udev	2011-09-02 12:20:57.000000000 +0300
@@ -90,13 +90,13 @@
 			eerror "Cannot load the unix domain socket module"
 		fi
 	fi
-	local opts="${udev_opts}"
+	local extra_commands="${udev_opts}"
 
 	ebegin "Starting udevd"
 	if yesno "${udev_debug:-no}"; then
-		/sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log
+		/sbin/udevd --daemon ${extra_commands} --debug 2>/dev/.udev/udev.log
 	else
-		start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts}
+		start-stop-daemon --start --exec /sbin/udevd -- --daemon ${extra_commands}
 	fi
 
 	eend $?
diff -Naur init.d-original/xinetd init.d-fixed/xinetd
--- init.d-original/xinetd	2007-09-02 01:08:14.000000000 +0300
+++ init.d-fixed/xinetd	2011-09-02 12:20:57.000000000 +0300
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.19 2005/07/30 07:34:26 vapier Exp $
 
-opts="start stop reload restart dump check"
+extra_commands="start stop reload restart dump check"
 
 depend() {
 	use net