simplify add_rcconf

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

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

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

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"

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

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

package/axtls/files/axhttpd.postinst

@@ -1,3 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf axhttpd
+add_rcconf axhttpd NO

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
 	}
 }

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

package/bitlbee/files/bitlbee.postinst

@@ -1,3 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf bitlbee
+add_rcconf bitlbee NO

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

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'

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

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

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

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

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

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

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 

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

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

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

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

package/esound/files/esound.postinst

@@ -1,3 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf esd
+add_rcconf esd NO

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

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"

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
 

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

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 ""

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

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"

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

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

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"

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

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

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

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

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

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

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

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

package/miau/files/miau.postinst

@@ -1,4 +1,4 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf miau
+add_rcconf miau NO
 

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 ' '

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 ' '

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

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

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

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 " "

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

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/

package/mpd/files/mpd.postinst

@@ -1,3 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf mpd
+add_rcconf mpd NO

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

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

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'

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

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)

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

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
 

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

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

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

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

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

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

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

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

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"

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

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"

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

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

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"

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"

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"

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

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

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

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

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"

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

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

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"

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

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"

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

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

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"
 

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

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

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

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

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

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

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

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

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

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

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

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