summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/adk-test-tools/files/adk-test-tools.postinst2
-rw-r--r--package/aiccu/files/aiccu.postinst2
-rw-r--r--package/alix-switch/files/alix-switch.postinst2
-rw-r--r--package/alsa-utils/files/alsa-utils.postinst6
-rw-r--r--package/asterisk/files/asterisk.postinst2
-rw-r--r--package/avahi/files/avahi-daemon.postinst2
-rw-r--r--package/axtls/files/axhttpd.postinst2
-rw-r--r--package/base-files/src/etc/functions.sh6
-rw-r--r--package/bind/files/bind-server.postinst2
-rw-r--r--package/bitlbee/files/bitlbee.postinst2
-rw-r--r--package/bkeymaps/files/bkeymaps.postinst3
-rw-r--r--package/busybox/files/busybox.postinst18
-rw-r--r--package/busybox/files/udhcpd.postinst2
-rw-r--r--package/cherokee/files/cherokee.postinst2
-rw-r--r--package/chillispot/files/chillispot.postinst2
-rw-r--r--package/collectd/files/collectd.postinst2
-rw-r--r--package/cups/files/cups.postinst2
-rw-r--r--package/dansguardian/files/dansguardian.postinst2
-rw-r--r--package/dbus/files/dbus.postinst2
-rw-r--r--package/dhcp-forwarder/files/dhcp-forwarder.postinst2
-rw-r--r--package/dhcp/files/dhcp-server.postinst4
-rw-r--r--package/dnsmasq/files/dnsmasq.postinst3
-rw-r--r--package/dropbear/files/dropbear.postinst4
-rw-r--r--package/esound/files/esound.postinst2
-rw-r--r--package/ez-ipupdate/files/ez-ipupdate.postinst2
-rw-r--r--package/fakeidentd/files/fakeidentd.postinst4
-rw-r--r--package/forked-daapd/files/forked-daapd.postinst2
-rw-r--r--package/freeradius-server/files/freeradius-server.postinst2
-rw-r--r--package/frickin/files/frickin.postinst4
-rw-r--r--package/gkrellm/files/gkrellmd.postinst2
-rw-r--r--package/gmediaserver/files/gmediaserver.postinst4
-rw-r--r--package/gpm/files/gpm.postinst4
-rw-r--r--package/heimdal/files/heimdal-server.postinst2
-rw-r--r--package/htpdate/files/htpdate.postinst4
-rw-r--r--package/igmpproxy/files/igmpproxy.postinst2
-rw-r--r--package/iptables/files/ip6tables.postinst3
-rw-r--r--package/iptables/files/iptables.postinst3
-rw-r--r--package/kbd/files/kbd.postinst4
-rw-r--r--package/krb5/files/krb5-server.postinst2
-rw-r--r--package/libvirt/files/libvirt.postinst2
-rw-r--r--package/lighttpd/files/lighttpd.postinst4
-rw-r--r--package/maradns/files/maradns.postinst2
-rw-r--r--package/miau/files/miau.postinst2
-rw-r--r--package/mini_httpd/files/mini-httpd-matrixssl.postinst3
-rw-r--r--package/mini_httpd/files/mini-httpd-openssl.postinst2
-rw-r--r--package/mini_httpd/files/mini-httpd.postinst4
-rw-r--r--package/miredo/files/miredo-server.postinst2
-rw-r--r--package/miredo/files/miredo.postinst2
-rw-r--r--package/monit/files/monit.postinst5
-rw-r--r--package/motion/files/motion.postinst2
-rw-r--r--package/mpd/Makefile4
-rw-r--r--package/mpd/files/mpd.postinst2
-rw-r--r--package/mrd6/files/mrd6.postinst2
-rw-r--r--package/mt-daapd/files/mt-daapd.postinst2
-rw-r--r--package/net-snmp/files/snmpd.postinst4
-rw-r--r--package/netperf/files/netperf.postinst2
-rw-r--r--package/nfs-utils/files/nfs-utils.postinst6
-rw-r--r--package/nginx/files/nginx.postinst2
-rw-r--r--package/nut/files/nut.postinst2
-rw-r--r--package/olsrd/files/olsrd.postinst2
-rw-r--r--package/openct/files/openct.postinst2
-rw-r--r--package/openldap/files/openldap-slapd.postinst2
-rw-r--r--package/openntpd/files/openntpd.postinst4
-rw-r--r--package/opensips/files/opensips.postinst2
-rw-r--r--package/openssh/files/openssh-server.postinst2
-rw-r--r--package/openswan/files/openswan.postinst2
-rw-r--r--package/openvpn/files/openvpn.postinst2
-rw-r--r--package/p910nd/files/p910nd.postinst4
-rw-r--r--package/pacemaker/files/pacemaker.postinst1
-rw-r--r--package/parprouted/files/parprouted.postinst4
-rw-r--r--package/pcsc-lite/files/pcscd.postinst2
-rw-r--r--package/pdnsd/files/pdnsd.postinst2
-rw-r--r--package/php/files/php-fastcgi.postinst4
-rw-r--r--package/pmacct/files/nfacctd.postinst4
-rw-r--r--package/pmacct/files/pmacctd.postinst4
-rw-r--r--package/polipo/files/polipo.postinst2
-rw-r--r--package/postfix/files/postfix.postinst2
-rw-r--r--package/pptpd/files/pptpd.postinst2
-rw-r--r--package/privoxy/files/privoxy.postinst3
-rw-r--r--package/pulseaudio/files/pulseaudio.postinst4
-rw-r--r--package/quagga/files/quagga.postinst3
-rw-r--r--package/radvd/files/radvd.postinst2
-rw-r--r--package/rarpd/files/rarpd.postinst4
-rw-r--r--package/rdate/files/rdate.postinst2
-rw-r--r--package/reaim/files/reaim.postinst4
-rw-r--r--package/rng-tools/files/rng-tools.postinst3
-rw-r--r--package/rp-pppoe/files/pppoe-client.postinst2
-rw-r--r--package/rp-pppoe/files/pppoe-relay.postinst4
-rw-r--r--package/rpcbind/files/rpcbind.postinst2
-rw-r--r--package/rrdcollect/files/rrdcollect.postinst2
-rw-r--r--package/samba/files/samba.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-coolscan2.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-dc25.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-dmc.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-epson.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-fujitsu.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-genesys.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-gt68xx.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-hp.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-hp3500.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-hp4200.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-hp5400.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-ibm.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-leo.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-lexmark.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-ma1509.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-matsushita.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-microtek.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-microtek2.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-mustek-usb.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-mustek-usb2.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-mustek.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-nec.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-net.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-niash.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-pie.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-pixma.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-plustek-pp.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-plustek.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-qcam.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-ricoh.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-s9036.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-sceptre.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-sharp.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-sm3600.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-sm3840.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-snapscan.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-sp15c.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-st400.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-stv680.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-tamarack.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-teco1.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-teco2.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-teco3.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-test.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-u12.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-umax-pp.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-umax.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-umax1220u.postinst2
-rw-r--r--package/sane-backends/files/sane-backend-v4l.postinst2
-rw-r--r--package/scanlogd/files/scanlogd.postinst2
-rw-r--r--package/shorewall-common/files/shorewall-common.postinst3
-rw-r--r--package/siproxd/files/siproxd.postinst2
-rw-r--r--package/snort/files/snort.postinst4
-rw-r--r--package/squeezelite/files/squeezelite.postinst4
-rw-r--r--package/squid/files/squid.postinst2
-rw-r--r--package/srelay/files/srelay.postinst4
-rw-r--r--package/strongswan/files/strongswan.postinst2
-rw-r--r--package/subversion/files/subversion.postinst4
-rw-r--r--package/syslog-ng/files/syslog-ng.postinst2
-rw-r--r--package/tinyproxy/files/tinyproxy.postinst2
-rw-r--r--package/tntnet/files/tntnet.postinst2
-rw-r--r--package/tor/files/tor.postinst2
-rw-r--r--package/totd/files/totd.postinst4
-rw-r--r--package/ulogd/files/ulogd.postinst2
-rw-r--r--package/uvd/files/uvd.postinst2
-rw-r--r--package/vrrpd/files/vrrpd.postinst4
-rw-r--r--package/vsftpd/files/vsftpd.postinst2
-rw-r--r--package/watchdog/files/watchdog.postinst2
-rw-r--r--package/wifidog/files/wifidog.postinst2
-rw-r--r--package/wondershaper/files/wondershaper.postinst2
-rw-r--r--package/xbmc/files/xbmc.postinst2
-rw-r--r--package/xdm/files/xdm.postinst2
-rw-r--r--package/xinetd/files/xinetd.postinst2
164 files changed, 208 insertions, 215 deletions
diff --git a/package/adk-test-tools/files/adk-test-tools.postinst b/package/adk-test-tools/files/adk-test-tools.postinst
index 4eebfede9..f193b2823 100644
--- a/package/adk-test-tools/files/adk-test-tools.postinst
+++ b/package/adk-test-tools/files/adk-test-tools.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf test test NO
+add_rcconf test NO
diff --git a/package/aiccu/files/aiccu.postinst b/package/aiccu/files/aiccu.postinst
index e6d0f0d9a..3c63b535e 100644
--- a/package/aiccu/files/aiccu.postinst
+++ b/package/aiccu/files/aiccu.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf aiccu aiccu NO
+add_rcconf aiccu NO
diff --git a/package/alix-switch/files/alix-switch.postinst b/package/alix-switch/files/alix-switch.postinst
index 28146bf44..ca5eae894 100644
--- a/package/alix-switch/files/alix-switch.postinst
+++ b/package/alix-switch/files/alix-switch.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf alix_switch alix_switch YES
+add_rcconf alix_switch YES
diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
index 0c381ff14..c58a2e02a 100644
--- a/package/alsa-utils/files/alsa-utils.postinst
+++ b/package/alsa-utils/files/alsa-utils.postinst
@@ -1,5 +1,5 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf amixer
-add_rcconf amixer_volume amixer_volume "80%"
-add_rcconf amixer_mixer amixer_mixer "Master PCM"
+add_rcconf amixer NO
+add_rcconf amixer_volume "80%"
+add_rcconf amixer_mixer "Master PCM"
diff --git a/package/asterisk/files/asterisk.postinst b/package/asterisk/files/asterisk.postinst
index 1186b2645..743e08c03 100644
--- a/package/asterisk/files/asterisk.postinst
+++ b/package/asterisk/files/asterisk.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf asterisk asterisk NO
+add_rcconf asterisk NO
diff --git a/package/avahi/files/avahi-daemon.postinst b/package/avahi/files/avahi-daemon.postinst
index 815c2579c..8fe8f1e32 100644
--- a/package/avahi/files/avahi-daemon.postinst
+++ b/package/avahi/files/avahi-daemon.postinst
@@ -5,4 +5,4 @@ add_group netdev $gid
gid2=$(get_next_gid)
add_group avahi $gid2
add_user avahi $(get_next_uid) $gid2 /tmp
-add_rcconf avahi avahi NO
+add_rcconf avahi NO
diff --git a/package/axtls/files/axhttpd.postinst b/package/axtls/files/axhttpd.postinst
index d19a62e8a..7e8f08390 100644
--- a/package/axtls/files/axhttpd.postinst
+++ b/package/axtls/files/axhttpd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf axhttpd
+add_rcconf axhttpd NO
diff --git a/package/base-files/src/etc/functions.sh b/package/base-files/src/etc/functions.sh
index 5d76f4843..09824d4db 100644
--- a/package/base-files/src/etc/functions.sh
+++ b/package/base-files/src/etc/functions.sh
@@ -53,9 +53,9 @@ add_service() {
}
add_rcconf() {
- rcconf_exists ${2-$1} || {
- echo "adding service ${2-$1} to /etc/rc.conf"
- printf '%s="%s"\t\t# %s\n' "${2:-$1}" "${3:-NO}" "$1" \
+ rcconf_exists $1 || {
+ echo "adding service $1 to /etc/rc.conf"
+ printf '%s="%s"\n' "${1}" "${2:-NO}" \
>>$IPKG_INSTROOT/etc/rc.conf
}
}
diff --git a/package/bind/files/bind-server.postinst b/package/bind/files/bind-server.postinst
index bca89fd22..18ddbfc13 100644
--- a/package/bind/files/bind-server.postinst
+++ b/package/bind/files/bind-server.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf named named NO
+add_rcconf named NO
diff --git a/package/bitlbee/files/bitlbee.postinst b/package/bitlbee/files/bitlbee.postinst
index a8e3b2ec4..a210ff227 100644
--- a/package/bitlbee/files/bitlbee.postinst
+++ b/package/bitlbee/files/bitlbee.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf bitlbee
+add_rcconf bitlbee NO
diff --git a/package/bkeymaps/files/bkeymaps.postinst b/package/bkeymaps/files/bkeymaps.postinst
index 07dace565..a429cd24c 100644
--- a/package/bkeymaps/files/bkeymaps.postinst
+++ b/package/bkeymaps/files/bkeymaps.postinst
@@ -1,4 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-
-add_rcconf bkeymaps kbd YES
+add_rcconf kbd YES
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index ed264244f..40d196c9a 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -1,12 +1,12 @@
#!/bin/sh
if [ -z $IPKG_INSTROOT ];then chmod u+s /bin/busybox;fi
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf network network YES
-add_rcconf crond crond NO
-add_rcconf watchdog watchdog NO
-add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20'
-add_rcconf syslogd syslogd NO
-add_rcconf 'use "-C32" normally' syslogd_flags '-C32'
-add_rcconf inetd inetd NO
-add_rcconf ntpd ntpd NO
-add_rcconf ntpd_flags ntpd_flags '-p time.fu-berlin.de'
+add_rcconf network YES
+add_rcconf crond NO
+add_rcconf watchdog NO
+add_rcconf watchdog_flags '-t 10 -T 20'
+add_rcconf syslogd NO
+add_rcconf syslogd_flags '-C32'
+add_rcconf inetd NO
+add_rcconf ntpd NO
+add_rcconf ntpd_flags '-p time.fu-berlin.de'
diff --git a/package/busybox/files/udhcpd.postinst b/package/busybox/files/udhcpd.postinst
index f90718c58..270c612a6 100644
--- a/package/busybox/files/udhcpd.postinst
+++ b/package/busybox/files/udhcpd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf udhcpd udhcpd 'NO'
+add_rcconf udhcpd NO
diff --git a/package/cherokee/files/cherokee.postinst b/package/cherokee/files/cherokee.postinst
index 07fb3dcb5..c2a9e2e56 100644
--- a/package/cherokee/files/cherokee.postinst
+++ b/package/cherokee/files/cherokee.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf cherokee cherokee NO
+add_rcconf cherokee NO
gid=$(get_next_gid)
add_group cherokee $gid
add_user cherokee $(get_next_uid) $gid /etc/cherokee
diff --git a/package/chillispot/files/chillispot.postinst b/package/chillispot/files/chillispot.postinst
index 20ad12d8c..f6a7f03ec 100644
--- a/package/chillispot/files/chillispot.postinst
+++ b/package/chillispot/files/chillispot.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf chillispot chillispot NO
+add_rcconf chillispot NO
diff --git a/package/collectd/files/collectd.postinst b/package/collectd/files/collectd.postinst
index 7e4416125..afe77f83e 100644
--- a/package/collectd/files/collectd.postinst
+++ b/package/collectd/files/collectd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf collectd collectd NO
+add_rcconf collectd NO
diff --git a/package/cups/files/cups.postinst b/package/cups/files/cups.postinst
index fa191bee7..070ce9eaa 100644
--- a/package/cups/files/cups.postinst
+++ b/package/cups/files/cups.postinst
@@ -3,4 +3,4 @@
gid=$(get_next_gid)
add_user cups $(get_next_uid) $gid /tmp
add_group cups $gid
-add_rcconf cups cups NO
+add_rcconf cups NO
diff --git a/package/dansguardian/files/dansguardian.postinst b/package/dansguardian/files/dansguardian.postinst
index 95f5fb639..8068f3d34 100644
--- a/package/dansguardian/files/dansguardian.postinst
+++ b/package/dansguardian/files/dansguardian.postinst
@@ -3,4 +3,4 @@
gid=$(get_next_gid)
add_user dansguardian $(get_next_uid) $gid /etc/dansguardian
add_group dansguardian $gid
-add_rcconf dansguardian dansguardian NO
+add_rcconf dansguardian NO
diff --git a/package/dbus/files/dbus.postinst b/package/dbus/files/dbus.postinst
index 97c5dd37a..e92450597 100644
--- a/package/dbus/files/dbus.postinst
+++ b/package/dbus/files/dbus.postinst
@@ -3,7 +3,7 @@
gid=$(get_next_gid)
add_group messagebus $gid
add_user messagebus $(get_next_uid) $gid /var/run/dbus
-add_rcconf dbus dbus NO
+add_rcconf dbus NO
echo Generating UUID
if [ -z $IPKG_INSTROOT ];then
mkdir /lib/dbus /var/lib
diff --git a/package/dhcp-forwarder/files/dhcp-forwarder.postinst b/package/dhcp-forwarder/files/dhcp-forwarder.postinst
index c08fed4f3..f36c6ccce 100644
--- a/package/dhcp-forwarder/files/dhcp-forwarder.postinst
+++ b/package/dhcp-forwarder/files/dhcp-forwarder.postinst
@@ -3,4 +3,4 @@
gid=$(get_next_gid)
add_group dhcp-fwd $gid
add_user dhcp-fwd $(get_next_uid) $gid /tmp
-add_rcconf dhcp_fwd dhcp_fwd NO
+add_rcconf dhcp_fwd NO
diff --git a/package/dhcp/files/dhcp-server.postinst b/package/dhcp/files/dhcp-server.postinst
index d27f5aa8d..8c20310d2 100644
--- a/package/dhcp/files/dhcp-server.postinst
+++ b/package/dhcp/files/dhcp-server.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf 'e.g. "eth0.1 eth1"' dhcpd_flags
-add_rcconf dhcpd dhcpd NO
+add_rcconf dhcpd_flags 'eth0'
+add_rcconf dhcpd NO
diff --git a/package/dnsmasq/files/dnsmasq.postinst b/package/dnsmasq/files/dnsmasq.postinst
index 86cf960e6..36833da08 100644
--- a/package/dnsmasq/files/dnsmasq.postinst
+++ b/package/dnsmasq/files/dnsmasq.postinst
@@ -1,7 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-
gid=$(get_next_gid)
add_user dnsmasq $(get_next_uid) $gid /tmp
add_group dnsmasq $gid
-add_rcconf dnsmasq dnsmasq NO
+add_rcconf dnsmasq NO
diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst
index c39e16944..deeead57e 100644
--- a/package/dropbear/files/dropbear.postinst
+++ b/package/dropbear/files/dropbear.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf dropbear_flags dropbear_flags " "
-add_rcconf dropbear dropbear NO
+add_rcconf dropbear_flags " "
+add_rcconf dropbear NO
diff --git a/package/esound/files/esound.postinst b/package/esound/files/esound.postinst
index 866b0f83e..ecf2ec8da 100644
--- a/package/esound/files/esound.postinst
+++ b/package/esound/files/esound.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf esd
+add_rcconf esd NO
diff --git a/package/ez-ipupdate/files/ez-ipupdate.postinst b/package/ez-ipupdate/files/ez-ipupdate.postinst
index c8094c139..6d15e0e6b 100644
--- a/package/ez-ipupdate/files/ez-ipupdate.postinst
+++ b/package/ez-ipupdate/files/ez-ipupdate.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf ezipupdate ezipupdate NO
+add_rcconf ezipupdate NO
diff --git a/package/fakeidentd/files/fakeidentd.postinst b/package/fakeidentd/files/fakeidentd.postinst
index 1a65cf2cc..a661d76b9 100644
--- a/package/fakeidentd/files/fakeidentd.postinst
+++ b/package/fakeidentd/files/fakeidentd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf fakeidentd fakeidentd NO
-add_rcconf fakeidentd_flags fakeidentd_flags "username"
+add_rcconf fakeidentd NO
+add_rcconf fakeidentd_flags "username"
diff --git a/package/forked-daapd/files/forked-daapd.postinst b/package/forked-daapd/files/forked-daapd.postinst
index 74a3b43bf..b4fdbdcae 100644
--- a/package/forked-daapd/files/forked-daapd.postinst
+++ b/package/forked-daapd/files/forked-daapd.postinst
@@ -3,5 +3,5 @@
gid=$(get_next_gid)
add_group daapd $gid
add_user daapd $(get_next_uid) $gid
-add_rcconf forked_daapd forked_daapd NO
+add_rcconf forked_daapd NO
diff --git a/package/freeradius-server/files/freeradius-server.postinst b/package/freeradius-server/files/freeradius-server.postinst
index c65fa195f..a20a7bf7a 100644
--- a/package/freeradius-server/files/freeradius-server.postinst
+++ b/package/freeradius-server/files/freeradius-server.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf radiusd radiusd NO
+add_rcconf radiusd NO
gid=$(get_next_gid)
add_group radius $gid
add_user radius $(get_next_uid) $gid /usr/lib/radius
diff --git a/package/frickin/files/frickin.postinst b/package/frickin/files/frickin.postinst
index e7dfd069e..78a387760 100644
--- a/package/frickin/files/frickin.postinst
+++ b/package/frickin/files/frickin.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf frickin frickin NO
-add_rcconf frickin_flags frickin_flags ""
+add_rcconf frickin NO
+add_rcconf frickin_flags ""
diff --git a/package/gkrellm/files/gkrellmd.postinst b/package/gkrellm/files/gkrellmd.postinst
index 56b7b06cc..f4a833c53 100644
--- a/package/gkrellm/files/gkrellmd.postinst
+++ b/package/gkrellm/files/gkrellmd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf gkrellmd gkrellmd NO
+add_rcconf gkrellmd NO
diff --git a/package/gmediaserver/files/gmediaserver.postinst b/package/gmediaserver/files/gmediaserver.postinst
index 2d5d4d8ee..6f1b1bde7 100644
--- a/package/gmediaserver/files/gmediaserver.postinst
+++ b/package/gmediaserver/files/gmediaserver.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf gmediaserver gmediaserver NO
-add_rcconf gmediaserver_flags gmediaserver_flags "--background --interface=eth0"
+add_rcconf gmediaserver NO
+add_rcconf gmediaserver_flags "--background --interface=eth0"
diff --git a/package/gpm/files/gpm.postinst b/package/gpm/files/gpm.postinst
index 82e63cf25..f9f5a12b1 100644
--- a/package/gpm/files/gpm.postinst
+++ b/package/gpm/files/gpm.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf 'options passed to gpm' gpm_flags "-m /dev/psaux -t ps2"
-add_rcconf gpm gpm NO
+add_rcconf gpm_flags "-m /dev/psaux -t ps2"
+add_rcconf gpm NO
diff --git a/package/heimdal/files/heimdal-server.postinst b/package/heimdal/files/heimdal-server.postinst
index 401d7bfd8..9c34773ee 100644
--- a/package/heimdal/files/heimdal-server.postinst
+++ b/package/heimdal/files/heimdal-server.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf "heimdal kdc" kdc NO
+add_rcconf kdc NO
add_service kerberos 88/tcp
add_service kerberos 88/udp
add_service kerberos-adm 749/tcp
diff --git a/package/htpdate/files/htpdate.postinst b/package/htpdate/files/htpdate.postinst
index baf149665..9a99ccf9d 100644
--- a/package/htpdate/files/htpdate.postinst
+++ b/package/htpdate/files/htpdate.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf htpdate htpdate NO
-add_rcconf htpdate_flags htpdate_flags "www.google.com www.yahoo.com www.linux.org www.freebsd.org"
+add_rcconf htpdate NO
+add_rcconf htpdate_flags "www.google.com www.yahoo.com www.linux.org www.freebsd.org"
diff --git a/package/igmpproxy/files/igmpproxy.postinst b/package/igmpproxy/files/igmpproxy.postinst
index 5ebfa6d66..58e8744d0 100644
--- a/package/igmpproxy/files/igmpproxy.postinst
+++ b/package/igmpproxy/files/igmpproxy.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf igmpproxy igmpproxy NO
+add_rcconf igmpproxy NO
diff --git a/package/iptables/files/ip6tables.postinst b/package/iptables/files/ip6tables.postinst
index 09645104b..90aa932a4 100644
--- a/package/iptables/files/ip6tables.postinst
+++ b/package/iptables/files/ip6tables.postinst
@@ -1,4 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-
-add_rcconf iptables firewall6 NO
+add_rcconf firewall6 NO
diff --git a/package/iptables/files/iptables.postinst b/package/iptables/files/iptables.postinst
index 89b0af164..99ca919ef 100644
--- a/package/iptables/files/iptables.postinst
+++ b/package/iptables/files/iptables.postinst
@@ -1,4 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-
-add_rcconf iptables firewall NO
+add_rcconf firewall NO
diff --git a/package/kbd/files/kbd.postinst b/package/kbd/files/kbd.postinst
index b2d973ee1..6d2133147 100644
--- a/package/kbd/files/kbd.postinst
+++ b/package/kbd/files/kbd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf kbd_map kbd_map "zaurus"
-add_rcconf kbd kbd NO
+add_rcconf kbd_map "zaurus"
+add_rcconf kbd NO
diff --git a/package/krb5/files/krb5-server.postinst b/package/krb5/files/krb5-server.postinst
index 24f1f7d78..9c34773ee 100644
--- a/package/krb5/files/krb5-server.postinst
+++ b/package/krb5/files/krb5-server.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf "MIT kdc" kdc NO
+add_rcconf kdc NO
add_service kerberos 88/tcp
add_service kerberos 88/udp
add_service kerberos-adm 749/tcp
diff --git a/package/libvirt/files/libvirt.postinst b/package/libvirt/files/libvirt.postinst
index 4c39b14f0..7ea5433b2 100644
--- a/package/libvirt/files/libvirt.postinst
+++ b/package/libvirt/files/libvirt.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf libvirtd libvirtd NO
+add_rcconf libvirtd NO
diff --git a/package/lighttpd/files/lighttpd.postinst b/package/lighttpd/files/lighttpd.postinst
index 559ccb61c..cde198858 100644
--- a/package/lighttpd/files/lighttpd.postinst
+++ b/package/lighttpd/files/lighttpd.postinst
@@ -1,7 +1,7 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf lighttpd lighttpd NO
-add_rcconf lighttpd_flags lighttpd_flags "-f /etc/lighttpd/lighttpd.conf"
+add_rcconf lighttpd NO
+add_rcconf lighttpd_flags "-f /etc/lighttpd/lighttpd.conf"
gid=$(get_next_gid)
add_user lighttpd $(get_next_uid) $gid /srv/www
add_group lighttpd $gid
diff --git a/package/maradns/files/maradns.postinst b/package/maradns/files/maradns.postinst
index e0c1d7877..f40c5a81d 100644
--- a/package/maradns/files/maradns.postinst
+++ b/package/maradns/files/maradns.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf maradns maradns NO
+add_rcconf maradns NO
diff --git a/package/miau/files/miau.postinst b/package/miau/files/miau.postinst
index b66242cff..3be1124c1 100644
--- a/package/miau/files/miau.postinst
+++ b/package/miau/files/miau.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf miau
+add_rcconf miau NO
diff --git a/package/mini_httpd/files/mini-httpd-matrixssl.postinst b/package/mini_httpd/files/mini-httpd-matrixssl.postinst
index dfcafaa9e..7087ac054 100644
--- a/package/mini_httpd/files/mini-httpd-matrixssl.postinst
+++ b/package/mini_httpd/files/mini-httpd-matrixssl.postinst
@@ -1,3 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf '"NO" to disable, "-C /etc/mini_httpd.conf" otherwise' mini_httpd_flags
+add_rcconf mini_httpd NO
+add_rcconf mini_httpd_flags ' '
diff --git a/package/mini_httpd/files/mini-httpd-openssl.postinst b/package/mini_httpd/files/mini-httpd-openssl.postinst
index dfcafaa9e..a520f5d10 100644
--- a/package/mini_httpd/files/mini-httpd-openssl.postinst
+++ b/package/mini_httpd/files/mini-httpd-openssl.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf '"NO" to disable, "-C /etc/mini_httpd.conf" otherwise' mini_httpd_flags
+add_rcconf mini_httpd_flags ' '
diff --git a/package/mini_httpd/files/mini-httpd.postinst b/package/mini_httpd/files/mini-httpd.postinst
index e1fc0ccca..7a81a99d0 100644
--- a/package/mini_httpd/files/mini-httpd.postinst
+++ b/package/mini_httpd/files/mini-httpd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf '"NO" to disable, "-C /etc/mini_httpd.conf" otherwise' mini_httpd_flags
-add_rcconf mini_httpd mini_httpd NO
+add_rcconf mini_httpd_flags ' '
+add_rcconf mini_httpd NO
diff --git a/package/miredo/files/miredo-server.postinst b/package/miredo/files/miredo-server.postinst
index e91bc4752..64b86e42a 100644
--- a/package/miredo/files/miredo-server.postinst
+++ b/package/miredo/files/miredo-server.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf miredo_server miredo_server NO
+add_rcconf miredo_server NO
diff --git a/package/miredo/files/miredo.postinst b/package/miredo/files/miredo.postinst
index 37667f8da..04c5f2b4e 100644
--- a/package/miredo/files/miredo.postinst
+++ b/package/miredo/files/miredo.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf miredo miredo NO
+add_rcconf miredo NO
diff --git a/package/monit/files/monit.postinst b/package/monit/files/monit.postinst
index fa7523993..e36865cd8 100644
--- a/package/monit/files/monit.postinst
+++ b/package/monit/files/monit.postinst
@@ -1,5 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf monit monit NO
-add_rcconf monit_flags monit_flags NO
-
+add_rcconf monit NO
+add_rcconf monit_flags " "
diff --git a/package/motion/files/motion.postinst b/package/motion/files/motion.postinst
index 596d6620e..9bee0bc92 100644
--- a/package/motion/files/motion.postinst
+++ b/package/motion/files/motion.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf motion motion NO
+add_rcconf motion NO
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 0e11a8459..0ba32ec2d 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 046f23f63ad9aa4af38159754f813fc7
PKG_DESCR:= music player daemon
PKG_SECTION:= multimedia
-PKG_DEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient
-PKG_FDEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient
+PKG_DEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient librt
+PKG_FDEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient librt
PKG_BUILDDEP:= glib libmpdclient
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/
diff --git a/package/mpd/files/mpd.postinst b/package/mpd/files/mpd.postinst
index 9eb855abe..b2d70b269 100644
--- a/package/mpd/files/mpd.postinst
+++ b/package/mpd/files/mpd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf mpd
+add_rcconf mpd NO
diff --git a/package/mrd6/files/mrd6.postinst b/package/mrd6/files/mrd6.postinst
index 10332bae6..c4f8a4462 100644
--- a/package/mrd6/files/mrd6.postinst
+++ b/package/mrd6/files/mrd6.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf mrd6 mrd6 NO
+add_rcconf mrd6 NO
diff --git a/package/mt-daapd/files/mt-daapd.postinst b/package/mt-daapd/files/mt-daapd.postinst
index 0059afb55..b248cbc67 100644
--- a/package/mt-daapd/files/mt-daapd.postinst
+++ b/package/mt-daapd/files/mt-daapd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf mt-daapd mt_daapd NO
+add_rcconf mt_daapd NO
diff --git a/package/net-snmp/files/snmpd.postinst b/package/net-snmp/files/snmpd.postinst
index d6fa70d67..ec0f1ecd7 100644
--- a/package/net-snmp/files/snmpd.postinst
+++ b/package/net-snmp/files/snmpd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf snmpd
-add_rcconf 'use "-Ls 1" to log to syslog' snmpd_flags '-Ls 1'
+add_rcconf snmpd NO
+add_rcconf snmpd_flags '-Ls 1'
diff --git a/package/netperf/files/netperf.postinst b/package/netperf/files/netperf.postinst
index 36ef9c140..0baaf9338 100644
--- a/package/netperf/files/netperf.postinst
+++ b/package/netperf/files/netperf.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf netserver netserver NO
+add_rcconf netserver NO
diff --git a/package/nfs-utils/files/nfs-utils.postinst b/package/nfs-utils/files/nfs-utils.postinst
index 6f89e0ae4..f4b5b5d3a 100644
--- a/package/nfs-utils/files/nfs-utils.postinst
+++ b/package/nfs-utils/files/nfs-utils.postinst
@@ -1,8 +1,8 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf "kernel nfs server" nfs_server NO
-add_rcconf "kernel nfs client (v4)" nfs_client NO
-add_rcconf "kernel nfs server version" nfs_server_version 3
+add_rcconf nfs_server NO
+add_rcconf nfs_client NO
+add_rcconf nfs_server_version 3
add_service nfs 2049/tcp
add_service nfs 2049/udp
gid=$(get_next_gid)
diff --git a/package/nginx/files/nginx.postinst b/package/nginx/files/nginx.postinst
index 5220c8e54..fcb1a013f 100644
--- a/package/nginx/files/nginx.postinst
+++ b/package/nginx/files/nginx.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf nginx nginx NO
+add_rcconf nginx NO
gid=$(get_next_gid)
add_group nginx $gid
add_user nginx $(get_next_uid) $gid /tmp/.nginx
diff --git a/package/nut/files/nut.postinst b/package/nut/files/nut.postinst
index cd5faf1af..c6e21169a 100644
--- a/package/nut/files/nut.postinst
+++ b/package/nut/files/nut.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf upsd upsd NO
+add_rcconf upsd NO
diff --git a/package/olsrd/files/olsrd.postinst b/package/olsrd/files/olsrd.postinst
index fb6fa2bca..31da736cf 100644
--- a/package/olsrd/files/olsrd.postinst
+++ b/package/olsrd/files/olsrd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf olsrd olsrd NO
+add_rcconf olsrd NO
diff --git a/package/openct/files/openct.postinst b/package/openct/files/openct.postinst
index c02a18c6d..81166e75a 100644
--- a/package/openct/files/openct.postinst
+++ b/package/openct/files/openct.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf openct openct NO
+add_rcconf openct NO
diff --git a/package/openldap/files/openldap-slapd.postinst b/package/openldap/files/openldap-slapd.postinst
index d6ecee377..b28da5e68 100644
--- a/package/openldap/files/openldap-slapd.postinst
+++ b/package/openldap/files/openldap-slapd.postinst
@@ -2,4 +2,4 @@
. $IPKG_INSTROOT/etc/functions.sh
add_user slapd $(get_next_uid) $(get_next_gid) /var/run/slapd
add_group slapd $(get_next_gid)
-add_rcconf 'use "YES" to enable' slapd NO
+add_rcconf slapd NO
diff --git a/package/openntpd/files/openntpd.postinst b/package/openntpd/files/openntpd.postinst
index c6d0bd33d..1e4f34da1 100644
--- a/package/openntpd/files/openntpd.postinst
+++ b/package/openntpd/files/openntpd.postinst
@@ -4,5 +4,5 @@ gid=$(get_next_gid)
add_group ntp $gid
add_user ntp $(get_next_uid) $gid /tmp/.ntp
add_service ntp 123/udp
-add_rcconf ntpd_flags ntpd_flags "-s"
-add_rcconf ntpd ntpd NO
+add_rcconf ntpd_flags "-s"
+add_rcconf ntpd NO
diff --git a/package/opensips/files/opensips.postinst b/package/opensips/files/opensips.postinst
index 369f66dd7..372b7a70e 100644
--- a/package/opensips/files/opensips.postinst
+++ b/package/opensips/files/opensips.postinst
@@ -1,3 +1,3 @@
#!/usr/bin/env sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf opensips
+add_rcconf opensips NO
diff --git a/package/openssh/files/openssh-server.postinst b/package/openssh/files/openssh-server.postinst
index e14a2b0b9..e398f5871 100644
--- a/package/openssh/files/openssh-server.postinst
+++ b/package/openssh/files/openssh-server.postinst
@@ -2,4 +2,4 @@
. $IPKG_INSTROOT/etc/functions.sh
add_user sshd $(get_next_uid) $(get_next_gid) /var/run/sshd
add_group sshd $(get_next_gid)
-add_rcconf 'use "NO" to disable always, "AUTO" if dropbear is on' openssh AUTO
+add_rcconf openssh NO
diff --git a/package/openswan/files/openswan.postinst b/package/openswan/files/openswan.postinst
index a5f8e11b2..eded80576 100644
--- a/package/openswan/files/openswan.postinst
+++ b/package/openswan/files/openswan.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf ipsec ipsec NO
+add_rcconf ipsec NO
diff --git a/package/openvpn/files/openvpn.postinst b/package/openvpn/files/openvpn.postinst
index 576ddd9f5..5bacf579c 100644
--- a/package/openvpn/files/openvpn.postinst
+++ b/package/openvpn/files/openvpn.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf openvpn openvpn NO
+add_rcconf openvpn NO
diff --git a/package/p910nd/files/p910nd.postinst b/package/p910nd/files/p910nd.postinst
index e384ba6b6..c14bf5984 100644
--- a/package/p910nd/files/p910nd.postinst
+++ b/package/p910nd/files/p910nd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf p910nd p910nd NO
-add_rcconf p910nd_flags p910nd_flags "0 -b -f /dev/usb/lp0"
+add_rcconf p910nd NO
+add_rcconf p910nd_flags "0 -b -f /dev/usb/lp0"
diff --git a/package/pacemaker/files/pacemaker.postinst b/package/pacemaker/files/pacemaker.postinst
index acda216de..008dd3320 100644
--- a/package/pacemaker/files/pacemaker.postinst
+++ b/package/pacemaker/files/pacemaker.postinst
@@ -1,6 +1,5 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-
gid=$(get_next_gid)
gid2=$(get_next_gid)
add_user hacluster $(get_next_uid) $gid /tmp
diff --git a/package/parprouted/files/parprouted.postinst b/package/parprouted/files/parprouted.postinst
index f46d2008c..31ce04c8a 100644
--- a/package/parprouted/files/parprouted.postinst
+++ b/package/parprouted/files/parprouted.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf parprouted parprouted NO
-add_rcconf parprouted_flags parprouted_flags "eth0"
+add_rcconf parprouted NO
+add_rcconf parprouted_flags "eth0"
diff --git a/package/pcsc-lite/files/pcscd.postinst b/package/pcsc-lite/files/pcscd.postinst
index 1b27f479d..c43bcec81 100644
--- a/package/pcsc-lite/files/pcscd.postinst
+++ b/package/pcsc-lite/files/pcscd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf pcscd pcscd NO
+add_rcconf pcscd NO
diff --git a/package/pdnsd/files/pdnsd.postinst b/package/pdnsd/files/pdnsd.postinst
index 4d63fd712..98ba25099 100644
--- a/package/pdnsd/files/pdnsd.postinst
+++ b/package/pdnsd/files/pdnsd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf pdnsd pdnsd NO
+add_rcconf pdnsd NO
diff --git a/package/php/files/php-fastcgi.postinst b/package/php/files/php-fastcgi.postinst
index 82fd22534..b976cf95f 100644
--- a/package/php/files/php-fastcgi.postinst
+++ b/package/php/files/php-fastcgi.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf php php NO
-add_rcconf php_flags php_flags "-b 2000"
+add_rcconf php NO
+add_rcconf php_flags "-b 2000"
diff --git a/package/pmacct/files/nfacctd.postinst b/package/pmacct/files/nfacctd.postinst
index 0b382cf0f..1ad9b3f35 100644
--- a/package/pmacct/files/nfacctd.postinst
+++ b/package/pmacct/files/nfacctd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf nfacctd nfacctd NO
-add_rcconf nfacctd_flags nfacctd_flags "-f /etc/nfacctd.conf"
+add_rcconf nfacctd NO
+add_rcconf nfacctd_flags "-f /etc/nfacctd.conf"
diff --git a/package/pmacct/files/pmacctd.postinst b/package/pmacct/files/pmacctd.postinst
index 49cde0f8e..ca362794f 100644
--- a/package/pmacct/files/pmacctd.postinst
+++ b/package/pmacct/files/pmacctd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf pmacctd pmacctd NO
-add_rcconf pmacctd_flags pmacctd_flags "-f /etc/pmacctd.conf"
+add_rcconf pmacctd NO
+add_rcconf pmacctd_flags "-f /etc/pmacctd.conf"
diff --git a/package/polipo/files/polipo.postinst b/package/polipo/files/polipo.postinst
index 4a76207e8..78dc964ed 100644
--- a/package/polipo/files/polipo.postinst
+++ b/package/polipo/files/polipo.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf polipo polipo NO
+add_rcconf polipo NO
diff --git a/package/postfix/files/postfix.postinst b/package/postfix/files/postfix.postinst
index 8c9fbba60..2d9a719a3 100644
--- a/package/postfix/files/postfix.postinst
+++ b/package/postfix/files/postfix.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf postfix postfix NO
+add_rcconf postfix NO
gid=$(get_next_gid)
add_group postfix $gid
add_user postfix $(get_next_uid) $gid /etc/postfix
diff --git a/package/pptpd/files/pptpd.postinst b/package/pptpd/files/pptpd.postinst
index 05b1af001..f2e57d4a5 100644
--- a/package/pptpd/files/pptpd.postinst
+++ b/package/pptpd/files/pptpd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf pptpd pptpd NO
+add_rcconf pptpd NO
diff --git a/package/privoxy/files/privoxy.postinst b/package/privoxy/files/privoxy.postinst
index 105b430c2..6f23e0f88 100644
--- a/package/privoxy/files/privoxy.postinst
+++ b/package/privoxy/files/privoxy.postinst
@@ -1,7 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-
gid=$(get_next_gid)
add_user privoxy $(get_next_uid) $gid /etc/privoxy
add_group privoxy $gid
-add_rcconf privoxy privoxy NO
+add_rcconf privoxy NO
diff --git a/package/pulseaudio/files/pulseaudio.postinst b/package/pulseaudio/files/pulseaudio.postinst
index e1ef8dfd1..fb77edbd5 100644
--- a/package/pulseaudio/files/pulseaudio.postinst
+++ b/package/pulseaudio/files/pulseaudio.postinst
@@ -1,7 +1,7 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf pulseaudio pulseaudio NO
+add_rcconf pulseaudio NO
gid=$(get_next_gid)
add_user pulse $(get_next_uid) $gid /var/run/pulse
add_group pulse $gid
-add_rcconf pulseaudio_flags pulseaudio_flags "-D --log-target=syslog"
+add_rcconf pulseaudio_flags "-D --log-target=syslog"
diff --git a/package/quagga/files/quagga.postinst b/package/quagga/files/quagga.postinst
index 868d00de9..22e74fb8c 100644
--- a/package/quagga/files/quagga.postinst
+++ b/package/quagga/files/quagga.postinst
@@ -1,10 +1,9 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-
gid=$(get_next_gid)
add_group quagga $gid
add_user quagga $(get_next_uid) $gid /tmp
-add_rcconf quagga quagga NO
+add_rcconf quagga NO
add_service zebrasrv 2600/tcp
add_service zebra 2601/tcp
add_service ripd 2602/tcp
diff --git a/package/radvd/files/radvd.postinst b/package/radvd/files/radvd.postinst
index 8e3ea08f6..258ba1502 100644
--- a/package/radvd/files/radvd.postinst
+++ b/package/radvd/files/radvd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf radvd radvd NO
+add_rcconf radvd NO
diff --git a/package/rarpd/files/rarpd.postinst b/package/rarpd/files/rarpd.postinst
index 236340c46..68ba32c57 100644
--- a/package/rarpd/files/rarpd.postinst
+++ b/package/rarpd/files/rarpd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf rarpd rarpd NO
-add_rcconf rarpd_flags rarpd_flags "-i eth0"
+add_rcconf rarpd NO
+add_rcconf rarpd_flags "-i eth0"
diff --git a/package/rdate/files/rdate.postinst b/package/rdate/files/rdate.postinst
index 993e74702..8462c7ebe 100644
--- a/package/rdate/files/rdate.postinst
+++ b/package/rdate/files/rdate.postinst
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf 'e.g. "-nv pool.ntp.org"' rdate_flags
+add_rcconf rdate_flags "-nv pool.ntp.org"
add_service ntp 123/tcp
add_service ntp 123/udp
diff --git a/package/reaim/files/reaim.postinst b/package/reaim/files/reaim.postinst
index 64f40e4bb..bb07dfae2 100644
--- a/package/reaim/files/reaim.postinst
+++ b/package/reaim/files/reaim.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf reaim reaim NO
-add_rcconf reaim_flags reaim_flags "eth0"
+add_rcconf reaim NO
+add_rcconf reaim_flags "eth0"
diff --git a/package/rng-tools/files/rng-tools.postinst b/package/rng-tools/files/rng-tools.postinst
index 4e769fe4b..f5bd83ff9 100644
--- a/package/rng-tools/files/rng-tools.postinst
+++ b/package/rng-tools/files/rng-tools.postinst
@@ -1,2 +1,3 @@
+#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf rngd rngd NO
+add_rcconf rngd NO
diff --git a/package/rp-pppoe/files/pppoe-client.postinst b/package/rp-pppoe/files/pppoe-client.postinst
index 2fd0db891..599f327a0 100644
--- a/package/rp-pppoe/files/pppoe-client.postinst
+++ b/package/rp-pppoe/files/pppoe-client.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf pppoe_client pppoe_client NO
+add_rcconf pppoe_client NO
diff --git a/package/rp-pppoe/files/pppoe-relay.postinst b/package/rp-pppoe/files/pppoe-relay.postinst
index 2a727ec96..bf479712b 100644
--- a/package/rp-pppoe/files/pppoe-relay.postinst
+++ b/package/rp-pppoe/files/pppoe-relay.postinst
@@ -1,5 +1,5 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf pppoe_relay pppoe_relay NO
-add_rcconf pppoe_relay_flags pppoe_relay_flags "-C eth2 -S vlan1"
+add_rcconf pppoe_relay NO
+add_rcconf pppoe_relay_flags "-C eth2 -S vlan1"
diff --git a/package/rpcbind/files/rpcbind.postinst b/package/rpcbind/files/rpcbind.postinst
index 7d26be995..03bfd0dbc 100644
--- a/package/rpcbind/files/rpcbind.postinst
+++ b/package/rpcbind/files/rpcbind.postinst
@@ -1,5 +1,5 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf rpcbind
+add_rcconf rpcbind NO
add_service rpcbind 111/tcp
add_service rpcbind 111/udp
diff --git a/package/rrdcollect/files/rrdcollect.postinst b/package/rrdcollect/files/rrdcollect.postinst
index 760d20811..6b0a41b88 100644
--- a/package/rrdcollect/files/rrdcollect.postinst
+++ b/package/rrdcollect/files/rrdcollect.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf rrdcollect rrdcollect NO
+add_rcconf rrdcollect NO
diff --git a/package/samba/files/samba.postinst b/package/samba/files/samba.postinst
index b9f99e86b..876c7bc72 100644
--- a/package/samba/files/samba.postinst
+++ b/package/samba/files/samba.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf samba samba NO
+add_rcconf samba NO
diff --git a/package/sane-backends/files/sane-backend-coolscan2.postinst b/package/sane-backends/files/sane-backend-coolscan2.postinst
index ff91beb9c..8341a40b5 100644
--- a/package/sane-backends/files/sane-backend-coolscan2.postinst
+++ b/package/sane-backends/files/sane-backend-coolscan2.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo coolscan2 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-dc25.postinst b/package/sane-backends/files/sane-backend-dc25.postinst
index 7081e48e8..debbdb8d5 100644
--- a/package/sane-backends/files/sane-backend-dc25.postinst
+++ b/package/sane-backends/files/sane-backend-dc25.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo dc25 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-dmc.postinst b/package/sane-backends/files/sane-backend-dmc.postinst
index 467a491f7..2d3a17011 100644
--- a/package/sane-backends/files/sane-backend-dmc.postinst
+++ b/package/sane-backends/files/sane-backend-dmc.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo dmc >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-epson.postinst b/package/sane-backends/files/sane-backend-epson.postinst
index 2040957be..e153faf79 100644
--- a/package/sane-backends/files/sane-backend-epson.postinst
+++ b/package/sane-backends/files/sane-backend-epson.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo epson >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-fujitsu.postinst b/package/sane-backends/files/sane-backend-fujitsu.postinst
index 6fce624c2..da55033b2 100644
--- a/package/sane-backends/files/sane-backend-fujitsu.postinst
+++ b/package/sane-backends/files/sane-backend-fujitsu.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo fujitsu >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-genesys.postinst b/package/sane-backends/files/sane-backend-genesys.postinst
index f35433580..0b22fb481 100644
--- a/package/sane-backends/files/sane-backend-genesys.postinst
+++ b/package/sane-backends/files/sane-backend-genesys.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo genesys >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-gt68xx.postinst b/package/sane-backends/files/sane-backend-gt68xx.postinst
index 4c0d2597d..efcbc23c1 100644
--- a/package/sane-backends/files/sane-backend-gt68xx.postinst
+++ b/package/sane-backends/files/sane-backend-gt68xx.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo gt68xx >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-hp.postinst b/package/sane-backends/files/sane-backend-hp.postinst
index 8302909c4..9d8ff6db4 100644
--- a/package/sane-backends/files/sane-backend-hp.postinst
+++ b/package/sane-backends/files/sane-backend-hp.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo hp >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-hp3500.postinst b/package/sane-backends/files/sane-backend-hp3500.postinst
index 3177c633d..78f447af1 100644
--- a/package/sane-backends/files/sane-backend-hp3500.postinst
+++ b/package/sane-backends/files/sane-backend-hp3500.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo hp3500 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-hp4200.postinst b/package/sane-backends/files/sane-backend-hp4200.postinst
index b6e81c5a9..b029d6d5e 100644
--- a/package/sane-backends/files/sane-backend-hp4200.postinst
+++ b/package/sane-backends/files/sane-backend-hp4200.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo hp4200 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-hp5400.postinst b/package/sane-backends/files/sane-backend-hp5400.postinst
index c69eac6d9..2e94ae070 100644
--- a/package/sane-backends/files/sane-backend-hp5400.postinst
+++ b/package/sane-backends/files/sane-backend-hp5400.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo hp5400 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-ibm.postinst b/package/sane-backends/files/sane-backend-ibm.postinst
index ed2d913b2..d9cc469da 100644
--- a/package/sane-backends/files/sane-backend-ibm.postinst
+++ b/package/sane-backends/files/sane-backend-ibm.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo ibm >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-leo.postinst b/package/sane-backends/files/sane-backend-leo.postinst
index 8eee90333..e3c37be20 100644
--- a/package/sane-backends/files/sane-backend-leo.postinst
+++ b/package/sane-backends/files/sane-backend-leo.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo leo >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-lexmark.postinst b/package/sane-backends/files/sane-backend-lexmark.postinst
index 5abb73069..74d3f6229 100644
--- a/package/sane-backends/files/sane-backend-lexmark.postinst
+++ b/package/sane-backends/files/sane-backend-lexmark.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo lexmark >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-ma1509.postinst b/package/sane-backends/files/sane-backend-ma1509.postinst
index 00eaf2cca..554c9ddcb 100644
--- a/package/sane-backends/files/sane-backend-ma1509.postinst
+++ b/package/sane-backends/files/sane-backend-ma1509.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo ma1509 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-matsushita.postinst b/package/sane-backends/files/sane-backend-matsushita.postinst
index c73421ea4..2e1a82364 100644
--- a/package/sane-backends/files/sane-backend-matsushita.postinst
+++ b/package/sane-backends/files/sane-backend-matsushita.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo matsushita >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-microtek.postinst b/package/sane-backends/files/sane-backend-microtek.postinst
index 1f1ed268d..b0a8604ad 100644
--- a/package/sane-backends/files/sane-backend-microtek.postinst
+++ b/package/sane-backends/files/sane-backend-microtek.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo microtek >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-microtek2.postinst b/package/sane-backends/files/sane-backend-microtek2.postinst
index a1e8356e2..62e916506 100644
--- a/package/sane-backends/files/sane-backend-microtek2.postinst
+++ b/package/sane-backends/files/sane-backend-microtek2.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo microtek2 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-mustek-usb.postinst b/package/sane-backends/files/sane-backend-mustek-usb.postinst
index 3b226a92f..859a965e7 100644
--- a/package/sane-backends/files/sane-backend-mustek-usb.postinst
+++ b/package/sane-backends/files/sane-backend-mustek-usb.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo mustek_usb >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-mustek-usb2.postinst b/package/sane-backends/files/sane-backend-mustek-usb2.postinst
index 9c8d4e7f7..ba6240169 100644
--- a/package/sane-backends/files/sane-backend-mustek-usb2.postinst
+++ b/package/sane-backends/files/sane-backend-mustek-usb2.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo mustek_usb2 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-mustek.postinst b/package/sane-backends/files/sane-backend-mustek.postinst
index 1290cb935..62bae0ceb 100644
--- a/package/sane-backends/files/sane-backend-mustek.postinst
+++ b/package/sane-backends/files/sane-backend-mustek.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo mustek >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-nec.postinst b/package/sane-backends/files/sane-backend-nec.postinst
index 002fcd98a..22c0ba6ef 100644
--- a/package/sane-backends/files/sane-backend-nec.postinst
+++ b/package/sane-backends/files/sane-backend-nec.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo nec >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-net.postinst b/package/sane-backends/files/sane-backend-net.postinst
index 1e35fbbf7..33167b8ff 100644
--- a/package/sane-backends/files/sane-backend-net.postinst
+++ b/package/sane-backends/files/sane-backend-net.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo net >>$IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-niash.postinst b/package/sane-backends/files/sane-backend-niash.postinst
index 148c68660..d85081d7a 100644
--- a/package/sane-backends/files/sane-backend-niash.postinst
+++ b/package/sane-backends/files/sane-backend-niash.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo niash >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-pie.postinst b/package/sane-backends/files/sane-backend-pie.postinst
index 39f0eabd2..040b61c81 100644
--- a/package/sane-backends/files/sane-backend-pie.postinst
+++ b/package/sane-backends/files/sane-backend-pie.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo pie >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-pixma.postinst b/package/sane-backends/files/sane-backend-pixma.postinst
index 773e4ebed..f7665462a 100644
--- a/package/sane-backends/files/sane-backend-pixma.postinst
+++ b/package/sane-backends/files/sane-backend-pixma.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo pixma >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-plustek-pp.postinst b/package/sane-backends/files/sane-backend-plustek-pp.postinst
index 805176075..0642264f3 100644
--- a/package/sane-backends/files/sane-backend-plustek-pp.postinst
+++ b/package/sane-backends/files/sane-backend-plustek-pp.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo plustek_pp >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-plustek.postinst b/package/sane-backends/files/sane-backend-plustek.postinst
index dee44430b..5ac0930fd 100644
--- a/package/sane-backends/files/sane-backend-plustek.postinst
+++ b/package/sane-backends/files/sane-backend-plustek.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo plustek >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-qcam.postinst b/package/sane-backends/files/sane-backend-qcam.postinst
index 0efd64074..8d737050c 100644
--- a/package/sane-backends/files/sane-backend-qcam.postinst
+++ b/package/sane-backends/files/sane-backend-qcam.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo qcam >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-ricoh.postinst b/package/sane-backends/files/sane-backend-ricoh.postinst
index 1fcc0535d..0f7306557 100644
--- a/package/sane-backends/files/sane-backend-ricoh.postinst
+++ b/package/sane-backends/files/sane-backend-ricoh.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo ricoh >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-s9036.postinst b/package/sane-backends/files/sane-backend-s9036.postinst
index 959944cc5..26910d5fa 100644
--- a/package/sane-backends/files/sane-backend-s9036.postinst
+++ b/package/sane-backends/files/sane-backend-s9036.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo s9036 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-sceptre.postinst b/package/sane-backends/files/sane-backend-sceptre.postinst
index d1b0635f6..d3446f755 100644
--- a/package/sane-backends/files/sane-backend-sceptre.postinst
+++ b/package/sane-backends/files/sane-backend-sceptre.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo sceptre >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-sharp.postinst b/package/sane-backends/files/sane-backend-sharp.postinst
index 517d2a1fa..0f1994e26 100644
--- a/package/sane-backends/files/sane-backend-sharp.postinst
+++ b/package/sane-backends/files/sane-backend-sharp.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo sharp >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-sm3600.postinst b/package/sane-backends/files/sane-backend-sm3600.postinst
index b61aaac44..1e6161b2e 100644
--- a/package/sane-backends/files/sane-backend-sm3600.postinst
+++ b/package/sane-backends/files/sane-backend-sm3600.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo sm3600 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-sm3840.postinst b/package/sane-backends/files/sane-backend-sm3840.postinst
index 75bf72276..4910fa7cf 100644
--- a/package/sane-backends/files/sane-backend-sm3840.postinst
+++ b/package/sane-backends/files/sane-backend-sm3840.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo sm3840 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-snapscan.postinst b/package/sane-backends/files/sane-backend-snapscan.postinst
index d178d062b..e37371a5d 100644
--- a/package/sane-backends/files/sane-backend-snapscan.postinst
+++ b/package/sane-backends/files/sane-backend-snapscan.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo snapscan >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-sp15c.postinst b/package/sane-backends/files/sane-backend-sp15c.postinst
index 889e638a0..a58374a7e 100644
--- a/package/sane-backends/files/sane-backend-sp15c.postinst
+++ b/package/sane-backends/files/sane-backend-sp15c.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo sp15c >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-st400.postinst b/package/sane-backends/files/sane-backend-st400.postinst
index 8c5c4444c..5fef028b9 100644
--- a/package/sane-backends/files/sane-backend-st400.postinst
+++ b/package/sane-backends/files/sane-backend-st400.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo st400 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-stv680.postinst b/package/sane-backends/files/sane-backend-stv680.postinst
index a32ceb3db..34a69387a 100644
--- a/package/sane-backends/files/sane-backend-stv680.postinst
+++ b/package/sane-backends/files/sane-backend-stv680.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo stv680 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-tamarack.postinst b/package/sane-backends/files/sane-backend-tamarack.postinst
index d909764d5..289a266a6 100644
--- a/package/sane-backends/files/sane-backend-tamarack.postinst
+++ b/package/sane-backends/files/sane-backend-tamarack.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo tamarack >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-teco1.postinst b/package/sane-backends/files/sane-backend-teco1.postinst
index 2f57dd58f..317950980 100644
--- a/package/sane-backends/files/sane-backend-teco1.postinst
+++ b/package/sane-backends/files/sane-backend-teco1.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo teco1 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-teco2.postinst b/package/sane-backends/files/sane-backend-teco2.postinst
index f40dbff9f..8c90a1f3e 100644
--- a/package/sane-backends/files/sane-backend-teco2.postinst
+++ b/package/sane-backends/files/sane-backend-teco2.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo teco2 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-teco3.postinst b/package/sane-backends/files/sane-backend-teco3.postinst
index 856c586e2..d737dee96 100644
--- a/package/sane-backends/files/sane-backend-teco3.postinst
+++ b/package/sane-backends/files/sane-backend-teco3.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo teco3 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-test.postinst b/package/sane-backends/files/sane-backend-test.postinst
index 872551149..e1b6afb0d 100644
--- a/package/sane-backends/files/sane-backend-test.postinst
+++ b/package/sane-backends/files/sane-backend-test.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo test >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-u12.postinst b/package/sane-backends/files/sane-backend-u12.postinst
index 6febe36e2..de055904c 100644
--- a/package/sane-backends/files/sane-backend-u12.postinst
+++ b/package/sane-backends/files/sane-backend-u12.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo u12 >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-umax-pp.postinst b/package/sane-backends/files/sane-backend-umax-pp.postinst
index c234c8bbd..125093cb6 100644
--- a/package/sane-backends/files/sane-backend-umax-pp.postinst
+++ b/package/sane-backends/files/sane-backend-umax-pp.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo umax_pp >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-umax.postinst b/package/sane-backends/files/sane-backend-umax.postinst
index ba668e5fe..ab7517328 100644
--- a/package/sane-backends/files/sane-backend-umax.postinst
+++ b/package/sane-backends/files/sane-backend-umax.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo umax >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-umax1220u.postinst b/package/sane-backends/files/sane-backend-umax1220u.postinst
index a5ec96d76..9a31742c3 100644
--- a/package/sane-backends/files/sane-backend-umax1220u.postinst
+++ b/package/sane-backends/files/sane-backend-umax1220u.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo umax1220u >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/sane-backends/files/sane-backend-v4l.postinst b/package/sane-backends/files/sane-backend-v4l.postinst
index 23dbf14ff..53dd53cad 100644
--- a/package/sane-backends/files/sane-backend-v4l.postinst
+++ b/package/sane-backends/files/sane-backend-v4l.postinst
@@ -1,2 +1,2 @@
-#/bin/sh
+#!/bin/sh
echo v4l >> $IPKG_INSTROOT/etc/sane.d/dll.conf
diff --git a/package/scanlogd/files/scanlogd.postinst b/package/scanlogd/files/scanlogd.postinst
index 237852192..d785f2743 100644
--- a/package/scanlogd/files/scanlogd.postinst
+++ b/package/scanlogd/files/scanlogd.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf scanlogd scanlogd NO
+add_rcconf scanlogd NO
gid=$(get_next_gid)
add_group scanlogd $gid
add_user scanlogd $(get_next_uid) $gid /tmp/
diff --git a/package/shorewall-common/files/shorewall-common.postinst b/package/shorewall-common/files/shorewall-common.postinst
index bade6304b..7b1c5e5cc 100644
--- a/package/shorewall-common/files/shorewall-common.postinst
+++ b/package/shorewall-common/files/shorewall-common.postinst
@@ -1,6 +1,5 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf shorewall
-
+add_rcconf shorewall NO
mkdir -p $IPKG_INSTROOT/usr/share/shorewall/runtime
chmod 0700 $IPKG_INSTROOT/usr/share/shorewall/runtime
diff --git a/package/siproxd/files/siproxd.postinst b/package/siproxd/files/siproxd.postinst
index bf72a7a06..a0f75a414 100644
--- a/package/siproxd/files/siproxd.postinst
+++ b/package/siproxd/files/siproxd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf siproxd siproxd NO
+add_rcconf siproxd NO
diff --git a/package/snort/files/snort.postinst b/package/snort/files/snort.postinst
index c491d1c5b..764927b00 100644
--- a/package/snort/files/snort.postinst
+++ b/package/snort/files/snort.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf snort snort NO
-add_rcconf snort_flags snort_flags "-i eth0.0 -c /etc/snort/snort.conf -D -N -q -s"
+add_rcconf snort NO
+add_rcconf snort_flags "-i eth0.0 -c /etc/snort/snort.conf -D -N -q -s"
diff --git a/package/squeezelite/files/squeezelite.postinst b/package/squeezelite/files/squeezelite.postinst
index e5d9c91ee..38484619a 100644
--- a/package/squeezelite/files/squeezelite.postinst
+++ b/package/squeezelite/files/squeezelite.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf squeezelite squeezelite NO
-add_rcconf squeezelite_flags squeezelite_flags "-z -a 160:5:0:0 -s 10.0.0.1"
+add_rcconf squeezelite NO
+add_rcconf squeezelite_flags "-z -a 160:5:0:0 -s 10.0.0.1"
diff --git a/package/squid/files/squid.postinst b/package/squid/files/squid.postinst
index 6a08126c9..1a99eedec 100644
--- a/package/squid/files/squid.postinst
+++ b/package/squid/files/squid.postinst
@@ -3,4 +3,4 @@
gid=$(get_next_gid)
add_user squid $(get_next_uid) $gid /var/squid/cache
add_group squid $gid
-add_rcconf squid squid NO
+add_rcconf squid NO
diff --git a/package/srelay/files/srelay.postinst b/package/srelay/files/srelay.postinst
index a3322a763..21c010944 100644
--- a/package/srelay/files/srelay.postinst
+++ b/package/srelay/files/srelay.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf srelay srelay NO
-add_rcconf srelay_flags srelay_flags "-c /etc/srelay.conf -r -s"
+add_rcconf srelay NO
+add_rcconf srelay_flags "-c /etc/srelay.conf -r -s"
diff --git a/package/strongswan/files/strongswan.postinst b/package/strongswan/files/strongswan.postinst
index a5f8e11b2..eded80576 100644
--- a/package/strongswan/files/strongswan.postinst
+++ b/package/strongswan/files/strongswan.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf ipsec ipsec NO
+add_rcconf ipsec NO
diff --git a/package/subversion/files/subversion.postinst b/package/subversion/files/subversion.postinst
index ac45645d6..1552a277f 100644
--- a/package/subversion/files/subversion.postinst
+++ b/package/subversion/files/subversion.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf svnserve
-add_rcconf svnserve svnserve_path /svn
+add_rcconf svnserve NO
+add_rcconf svnserve_path /svn
diff --git a/package/syslog-ng/files/syslog-ng.postinst b/package/syslog-ng/files/syslog-ng.postinst
index 254f67872..331ddd948 100644
--- a/package/syslog-ng/files/syslog-ng.postinst
+++ b/package/syslog-ng/files/syslog-ng.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf syslog_ng syslog_ng NO
+add_rcconf syslog_ng NO
diff --git a/package/tinyproxy/files/tinyproxy.postinst b/package/tinyproxy/files/tinyproxy.postinst
index 903927e49..639dad599 100644
--- a/package/tinyproxy/files/tinyproxy.postinst
+++ b/package/tinyproxy/files/tinyproxy.postinst
@@ -3,4 +3,4 @@
gid=$(get_next_gid)
add_user tinyproxy $(get_next_uid) $gid /etc/tinyproxy
add_group tinyproxy $gid
-add_rcconf tinyproxy tinyproxy NO
+add_rcconf tinyproxy NO
diff --git a/package/tntnet/files/tntnet.postinst b/package/tntnet/files/tntnet.postinst
index 8a86ea6b0..7bdfea5bd 100644
--- a/package/tntnet/files/tntnet.postinst
+++ b/package/tntnet/files/tntnet.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf tntnet tntnet NO
+add_rcconf tntnet NO
gid=$(get_next_gid)
add_group tntnet $gid
add_user tntnet $(get_next_uid) $gid /www
diff --git a/package/tor/files/tor.postinst b/package/tor/files/tor.postinst
index 7a374861b..42f8c920d 100644
--- a/package/tor/files/tor.postinst
+++ b/package/tor/files/tor.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf tor tor NO
+add_rcconf tor NO
gid=$(get_next_gid)
add_group tor $gid
add_user tor $(get_next_uid) $gid /etc/tor
diff --git a/package/totd/files/totd.postinst b/package/totd/files/totd.postinst
index 12c7c1864..645225b42 100644
--- a/package/totd/files/totd.postinst
+++ b/package/totd/files/totd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf 'additional flags for totd' totd_flags "-q"
-add_rcconf totd totd NO
+add_rcconf totd_flags "-q"
+add_rcconf totd NO
diff --git a/package/ulogd/files/ulogd.postinst b/package/ulogd/files/ulogd.postinst
index 86e3d4348..2c8732337 100644
--- a/package/ulogd/files/ulogd.postinst
+++ b/package/ulogd/files/ulogd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf ulogd ulogd NO
+add_rcconf ulogd NO
diff --git a/package/uvd/files/uvd.postinst b/package/uvd/files/uvd.postinst
index ce254d5e7..14fa9cf5c 100644
--- a/package/uvd/files/uvd.postinst
+++ b/package/uvd/files/uvd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf uvd uvd NO
+add_rcconf uvd NO
diff --git a/package/vrrpd/files/vrrpd.postinst b/package/vrrpd/files/vrrpd.postinst
index 4f40f8b1e..2edaf63ae 100644
--- a/package/vrrpd/files/vrrpd.postinst
+++ b/package/vrrpd/files/vrrpd.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf vrrpd vrrpd NO
-add_rcconf vrrpd_flags vrrpd_flags "-i vlan1 -v 1 192.168.1.1"
+add_rcconf vrrpd NO
+add_rcconf vrrpd_flags "-i vlan1 -v 1 192.168.1.1"
diff --git a/package/vsftpd/files/vsftpd.postinst b/package/vsftpd/files/vsftpd.postinst
index c64e98223..2e0028c44 100644
--- a/package/vsftpd/files/vsftpd.postinst
+++ b/package/vsftpd/files/vsftpd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf vsftpd vsftpd NO
+add_rcconf vsftpd NO
diff --git a/package/watchdog/files/watchdog.postinst b/package/watchdog/files/watchdog.postinst
index a44195149..c8414b07c 100644
--- a/package/watchdog/files/watchdog.postinst
+++ b/package/watchdog/files/watchdog.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf watchdog watchdog YES
+add_rcconf watchdog NO
diff --git a/package/wifidog/files/wifidog.postinst b/package/wifidog/files/wifidog.postinst
index e778a2300..5542d8020 100644
--- a/package/wifidog/files/wifidog.postinst
+++ b/package/wifidog/files/wifidog.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf wifidog wifidog NO
+add_rcconf wifidog NO
diff --git a/package/wondershaper/files/wondershaper.postinst b/package/wondershaper/files/wondershaper.postinst
index 6e6c384a0..2667b5e31 100644
--- a/package/wondershaper/files/wondershaper.postinst
+++ b/package/wondershaper/files/wondershaper.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf wondershaper wondershaper NO
+add_rcconf wondershaper NO
diff --git a/package/xbmc/files/xbmc.postinst b/package/xbmc/files/xbmc.postinst
index 60fffdadc..45274da68 100644
--- a/package/xbmc/files/xbmc.postinst
+++ b/package/xbmc/files/xbmc.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf xbmc xbmc NO
+add_rcconf xbmc NO
diff --git a/package/xdm/files/xdm.postinst b/package/xdm/files/xdm.postinst
index be112629e..302e3f8cd 100644
--- a/package/xdm/files/xdm.postinst
+++ b/package/xdm/files/xdm.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf xdm xdm YES
+add_rcconf xdm NO
diff --git a/package/xinetd/files/xinetd.postinst b/package/xinetd/files/xinetd.postinst
index c9869d167..6e0b76879 100644
--- a/package/xinetd/files/xinetd.postinst
+++ b/package/xinetd/files/xinetd.postinst
@@ -1,3 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf xinetd xinetd NO
+add_rcconf xinetd NO