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
master
Luka Perkov 11 years ago
parent 0b09a89340
commit ef5f836207
  1. 2
      package/network/services/dnsmasq/files/dnsmasq.init
  2. 3
      package/network/services/dropbear/files/dropbear.init
  3. 7
      package/network/services/relayd/files/relay.init
  4. 7
      package/system/procd/files/log.init
  5. 1
      package/utils/busybox/files/cron
  6. 3
      package/utils/busybox/files/sysntpd
  7. 6
      package/utils/busybox/files/telnet

@ -75,7 +75,7 @@ append_addnhosts() {
} }
append_bogusnxdomain() { append_bogusnxdomain() {
xappend "--bogus-nxdomain=$1" xappend "--bogus-nxdomain=$1"
} }
dnsmasq() { dnsmasq() {

@ -6,9 +6,8 @@ START=50
STOP=50 STOP=50
USE_PROCD=1 USE_PROCD=1
NAME=dropbear
PROG=/usr/sbin/dropbear PROG=/usr/sbin/dropbear
NAME=dropbear
PIDCOUNT=0 PIDCOUNT=0
EXTRA_COMMANDS="killclients" EXTRA_COMMANDS="killclients"
EXTRA_HELP=" killclients Kill ${NAME} processes except servers and yourself" EXTRA_HELP=" killclients Kill ${NAME} processes except servers and yourself"

@ -1,5 +1,6 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (c) 2011-2012 OpenWrt.org # Copyright (c) 2011-2012 OpenWrt.org
START=80 START=80
USE_PROCD=1 USE_PROCD=1
@ -40,8 +41,8 @@ start_relay() {
fi fi
} }
procd_open_instance procd_open_instance
procd_set_param command "$PROG" procd_set_param command "$PROG"
local net networks local net networks
config_get networks "$cfg" network config_get networks "$cfg" network
@ -83,7 +84,7 @@ start_relay() {
local fwd_dhcp # = 1 local fwd_dhcp # = 1
config_get_bool fwd_dhcp "$cfg" forward_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 procd_close_instance
} }

@ -6,7 +6,6 @@ START=21
STOP=89 STOP=89
USE_PROCD=1 USE_PROCD=1
NAME=logread
PROG=/sbin/logread PROG=/sbin/logread
start_service_file() start_service_file()
@ -15,13 +14,13 @@ start_service_file()
local log_file log_size local log_file log_size
config_get log_file $1 log_file 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 [ -z "${log_file}" ] && return
procd_open_instance procd_open_instance
procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file" 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 procd_close_instance
} }
@ -38,7 +37,7 @@ start_service_remote()
procd_open_instance procd_open_instance
procd_set_param command "$PROG" -f -r "$log_ip" "${log_port:-514}" -p "$pid_file" 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 procd_close_instance
} }

@ -5,7 +5,6 @@ START=50
USE_PROCD=1 USE_PROCD=1
PROG=/usr/sbin/crond PROG=/usr/sbin/crond
NAME=crond
start_service () { start_service () {
[ -z "$(ls /etc/crontabs/)" ] && return 1 [ -z "$(ls /etc/crontabs/)" ] && return 1

@ -5,7 +5,6 @@ START=98
USE_PROCD=1 USE_PROCD=1
PROG=/usr/sbin/ntpd PROG=/usr/sbin/ntpd
SERVICE_PID_FILE=/var/run/sysntpd.pid
start_service() { start_service() {
local peers local peers
@ -20,7 +19,7 @@ start_service() {
procd_open_instance procd_open_instance
procd_set_param command "$PROG" -n 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" ] && { [ -n "$peers" ] && {
local peer local peer
for peer in $peers; do for peer in $peers; do

@ -2,9 +2,9 @@
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2011 OpenWrt.org
START=50 START=50
USE_PROCD=1 USE_PROCD=1
PROG=/usr/sbin/telnetd PROG=/usr/sbin/telnetd
NAME=telnetd
has_root_pwd() { has_root_pwd() {
local pwd=$([ -f "$1" ] && cat "$1") local pwd=$([ -f "$1" ] && cat "$1")
@ -31,8 +31,8 @@ start_service() {
! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \ ! 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 ); ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
then then
procd_open_instance procd_open_instance
procd_set_param command "$PROG" -F -l /bin/login.sh procd_set_param command "$PROG" -F -l /bin/login.sh
procd_close_instance procd_close_instance
fi fi
} }

Loading…
Cancel
Save