emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use yesno for more robustness

Browse Source
This commit is contained in:
Roy Marples 2007-11-22 13:28:14 +00:00
parent e31e930825
commit 09c5e5d415
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net.BSD/iwconfig.sh
View File

@ -554,7 +554,7 @@ iwconfig_configure() {
iwconfig_pre_start() {
# We don't configure wireless if we're being called from
# the background
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
save_options "SSID" ""
_exists || return 0
@ -586,7 +586,7 @@ iwconfig_pre_start() {
}
iwconfig_post_stop() {
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
_is_wireless || return 0
iwconfig_defaults
#iwconfig "${IFACE}" txpower 0 2>/dev/null

4
net.Linux/ifplugd.sh
View File

@ -36,7 +36,7 @@ ifplugd_pre_start() {
local pidfile="/var/run/ifplugd.${IFACE}.pid" timeout= args=
# We don't start netplug if we're being called from the background
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
_exists || return 0
@ -99,7 +99,7 @@ ifplugd_pre_start() {
}
ifplugd_stop() {
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
local pidfile="/var/run/ifplugd.${IFACE}.pid"
[ ! -e "${pidfile}" ] && return 0

4
net.Linux/iwconfig.sh
View File

@ -685,7 +685,7 @@ iwconfig_configure() {
iwconfig_pre_start() {
# We don't configure wireless if we're being called from
# the background
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
save_options "SSID" ""
_exists || return 0
@ -750,7 +750,7 @@ iwconfig_pre_start() {
}
iwconfig_post_stop() {
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
_exists || return 0
iwconfig_defaults
iwconfig "${IFACE}" txpower off 2>/dev/null

4
net.Linux/netplugd.sh
View File

@ -39,7 +39,7 @@ netplugd_pre_start() {
local pidfile="/var/run/netplugd-${IFACE}.pid" timeout=
# We don't start netplug if we're being called from the background
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
_exists || return 0
@ -101,7 +101,7 @@ netplugd_pre_start() {
}
netplugd_stop() {
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
local pidfile="/var/run/netplugd-${IFACE}.pid"
[ ! -e "${pidfile}" ] && return 0

4
net.Linux/pppd.sh
View File

@ -45,7 +45,7 @@ pppd_pre_start() {
# Set our base metric
metric=4000
if ${IN_BACKGROUND} ; then
if yesno ${IN_BACKGROUND}; then
local config=
eval config=\$config_${IFVAR}
# If no config for ppp then don't default to DHCP
@ -245,7 +245,7 @@ pppd_start() {
}
pppd_stop() {
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
local pidfile="/var/run/ppp-${IFACE}.pid"
[ ! -s "${pidfile}" ] && return 0

2
net/macchanger.sh
View File

@ -31,7 +31,7 @@ _config_vars="$_config_vars mac"
macchanger_pre_start() {
# We don't change MAC addresses from background
${IN_BACKGROUND} && return 0
yesno ${IN_BACKGROUND} && return 0
local mac= opts=

4
net/wpa_supplicant.sh
View File

@ -80,7 +80,7 @@ wpa_supplicant_pre_start() {
# We don't configure wireless if we're being called from
# the background unless we're not currently running
if [ "${IN_BACKGROUND}" = "true" ] ; then
if yesno ${IN_BACKGROUND}; then
if service_started_daemon "${SVCNAME}" /sbin/wpa_supplicant ; then
SSID=$(_get_ssid "${IFACE}")
SSIDVAR=$(_shell_var "${SSID}")
@ -186,7 +186,7 @@ wpa_supplicant_post_stop() {
wpac=/bin/wpa_cli
fi
if [ "${IN_BACKGROUND}" = "true" ] ; then
if yesno "${IN_BACKGROUND}"; then
# Only stop wpa_supplicant if it's not the controlling daemon
! service_started_daemon "${SVCNAME}" "${wpas}" 1
fi

4
sh/net.sh
View File

@ -28,7 +28,7 @@ MODULESDIR="${RC_LIBDIR}/net"
MODULESLIST="${RC_SVCDIR}/nettree"
_config_vars="config routes"
[ -z "${IN_BACKGROUND}" ] && IN_BACKGROUND=false
[ -z "${IN_BACKGROUND}" ] && IN_BACKGROUND="NO"
description="Configures network interfaces."
@ -644,7 +644,7 @@ stop() {
fi
done
[ "${IN_BACKGROUND}" != "true" ] && \
! yesno ${IN_BACKGROUND} && \
[ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ] && \
_down 2>/dev/null