EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix various init scripts

Browse Source 
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
This commit is contained in:
Luka Perkov 2013-09-23 21:58:36 +00:00
parent 0b09a89340
commit ef5f836207
7 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/dnsmasq/files/dnsmasq.init
View File

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

3
package/network/services/dropbear/files/dropbear.init
View File

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

7
package/network/services/relayd/files/relay.init
View File

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

7
package/system/procd/files/log.init
View File

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

1
package/utils/busybox/files/cron
View File

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

3
package/utils/busybox/files/sysntpd
View File

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

6
package/utils/busybox/files/telnet
View File

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