From: Luka Perkov <luka@openwrt.org>
Date: Mon, 23 Sep 2013 21:58:36 +0000 (+0000)
Subject: fix various init scripts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ef5f83620738c07f4e67042c80578882418aaf0c;p=openwrt%2Fstaging%2Frmilecki.git

fix various init scripts

Changes include:

* removing unused variables
* replacing spaces with tabs where appropriate
* more consistency with variable declarations

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38142
---

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index a0aee8e02b4..560928b7640 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -75,7 +75,7 @@ append_addnhosts() {
 }
 
 append_bogusnxdomain() {
-    xappend "--bogus-nxdomain=$1"
+	xappend "--bogus-nxdomain=$1"
 }
 
 dnsmasq() {
diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init
index 728767f0309..320a401e2e2 100755
--- a/package/network/services/dropbear/files/dropbear.init
+++ b/package/network/services/dropbear/files/dropbear.init
@@ -6,9 +6,8 @@ START=50
 STOP=50
 
 USE_PROCD=1
-
-NAME=dropbear
 PROG=/usr/sbin/dropbear
+NAME=dropbear
 PIDCOUNT=0
 EXTRA_COMMANDS="killclients"
 EXTRA_HELP="	killclients Kill ${NAME} processes except servers and yourself"
diff --git a/package/network/services/relayd/files/relay.init b/package/network/services/relayd/files/relay.init
index edc419c0b9b..d73df6ab552 100644
--- a/package/network/services/relayd/files/relay.init
+++ b/package/network/services/relayd/files/relay.init
@@ -1,5 +1,6 @@
 #!/bin/sh /etc/rc.common
 # Copyright (c) 2011-2012 OpenWrt.org
+
 START=80
 
 USE_PROCD=1
@@ -40,8 +41,8 @@ start_relay() {
 		fi
 	}
 
-        procd_open_instance
-        procd_set_param command "$PROG"
+	procd_open_instance
+	procd_set_param command "$PROG"
 
 	local net networks
 	config_get networks "$cfg" network
@@ -83,7 +84,7 @@ start_relay() {
 
 	local fwd_dhcp # = 1
 	config_get_bool fwd_dhcp "$cfg" forward_dhcp 1
-	[ $fwd_dhcp -eq 1 ] && procd_append_param command"-D"
+	[ $fwd_dhcp -eq 1 ] && procd_append_param command "-D"
 
 	procd_close_instance
 }
diff --git a/package/system/procd/files/log.init b/package/system/procd/files/log.init
index 14fbdf8c549..d0e3025714b 100644
--- a/package/system/procd/files/log.init
+++ b/package/system/procd/files/log.init
@@ -6,7 +6,6 @@ START=21
 STOP=89
 
 USE_PROCD=1
-NAME=logread
 PROG=/sbin/logread
 
 start_service_file()
@@ -15,13 +14,13 @@ start_service_file()
 	local log_file log_size
 
 	config_get log_file $1 log_file
-        config_get log_size $1 log_size
+	config_get log_size $1 log_size
 
 	[ -z "${log_file}" ] && return
 
 	procd_open_instance
 	procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file"
-        [ -n "${log_size}" ] && procd_append_param command -S "$log_size"
+	[ -n "${log_size}" ] && procd_append_param command -S "$log_size"
 	procd_close_instance
 }
 
@@ -38,7 +37,7 @@ start_service_remote()
 
 	procd_open_instance
 	procd_set_param command "$PROG" -f -r "$log_ip" "${log_port:-514}" -p "$pid_file"
-        [ "${log_proto}" != "udp" ] || procd_append_param command -u
+	[ "${log_proto}" != "udp" ] || procd_append_param command -u
 	procd_close_instance
 }
 
diff --git a/package/utils/busybox/files/cron b/package/utils/busybox/files/cron
index fa368098c29..5e6b4bf3feb 100755
--- a/package/utils/busybox/files/cron
+++ b/package/utils/busybox/files/cron
@@ -5,7 +5,6 @@ START=50
 
 USE_PROCD=1
 PROG=/usr/sbin/crond
-NAME=crond
 
 start_service () {
 	[ -z "$(ls /etc/crontabs/)" ] && return 1
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
index d7a9807a87d..ebdda63df96 100755
--- a/package/utils/busybox/files/sysntpd
+++ b/package/utils/busybox/files/sysntpd
@@ -5,7 +5,6 @@ START=98
 
 USE_PROCD=1
 PROG=/usr/sbin/ntpd
-SERVICE_PID_FILE=/var/run/sysntpd.pid
 
 start_service() {
 	local peers
@@ -20,7 +19,7 @@ start_service() {
 
 	procd_open_instance
 	procd_set_param command "$PROG" -n
-        [ $enable_server -ne 0 ] && procd_append_param command -l
+	[ $enable_server -ne 0 ] && procd_append_param command -l
 	[ -n "$peers" ] && {
 		local peer
 		for peer in $peers; do
diff --git a/package/utils/busybox/files/telnet b/package/utils/busybox/files/telnet
index 8ffd904078e..a1d1cdf9b18 100755
--- a/package/utils/busybox/files/telnet
+++ b/package/utils/busybox/files/telnet
@@ -2,9 +2,9 @@
 # Copyright (C) 2006-2011 OpenWrt.org
 
 START=50
+
 USE_PROCD=1
 PROG=/usr/sbin/telnetd
-NAME=telnetd
 
 has_root_pwd() {
 	local pwd=$([ -f "$1" ] && cat "$1")
@@ -31,8 +31,8 @@ start_service() {
 	     ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
 	   ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
 	then
-	        procd_open_instance
-        	procd_set_param command "$PROG" -F -l /bin/login.sh
+		procd_open_instance
+		procd_set_param command "$PROG" -F -l /bin/login.sh
 		procd_close_instance
 	fi
 }