summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2005-09-04 08:24:14 +0000
committerBenedikt Boehm <hollow@gentoo.org>2005-09-04 08:24:14 +0000
commit713a4997e8e136168f00b51bdb818d7bf10056f2 (patch)
treeebe60f141eb3d64aeadc14331bd3116aa2c1f148 /sbin
parentremove useless stuff (diff)
downloadbaselayout-vserver-713a4997e8e136168f00b51bdb818d7bf10056f2.tar.gz
baselayout-vserver-713a4997e8e136168f00b51bdb818d7bf10056f2.tar.bz2
baselayout-vserver-713a4997e8e136168f00b51bdb818d7bf10056f2.zip
remove single and splash
svn path=/baselayout-vserver/trunk/; revision=27
Diffstat (limited to 'sbin')
-rwxr-xr-xsbin/rc-services.sh10
-rwxr-xr-xsbin/runscript.sh3
2 files changed, 1 insertions, 12 deletions
diff --git a/sbin/rc-services.sh b/sbin/rc-services.sh
index c0ffe1d..d75b91c 100755
--- a/sbin/rc-services.sh
+++ b/sbin/rc-services.sh
@@ -367,20 +367,16 @@ start_service() {
if is_fake_service "${service}" "${SOFTLEVEL}" ; then
mark_service_started "${service}"
- splash "svc_start" "${service}"
- splash "svc_started" "${service}" "0"
return 0
fi
begin_service "${service}" || return 0
- splash "svc_start" "${service}"
if [[ ${RC_PARALLEL_STARTUP} != "yes" \
|| ${START_CRITICAL} == "yes" ]] ; then
# if we can not start the services in parallel
# then just start it and return the exit status
( "/etc/init.d/${service}" start )
retval="$?"
- splash "svc_started" "${service}" "${retval}"
end_service "${service}" "${retval}"
return "${retval}"
else
@@ -388,7 +384,6 @@ start_service() {
(
"/etc/init.d/${service}" start
retval="$?"
- splash "svc_started" "${service}" "${retval}"
end_service "${service}" "${retval}"
) &
return 0
@@ -415,22 +410,18 @@ stop_service() {
is_runlevel_stop && level="${OLDSOFTLEVEL}"
if is_fake_service "${service}" "${level}" ; then
- splash "svc_stop" "${service}"
mark_service_stopped "${service}"
- splash "svc_stopped" "${service}" "0"
return 0
fi
begin_service "${service}" || return 0
- splash "svc_stop" "${service}"
if [[ ${RC_PARALLEL_STARTUP} != "yes" \
|| ${STOP_CRITICAL} == "yes" ]] ; then
# if we can not start the services in parallel
# then just start it and return the exit status
( "/etc/init.d/${service}" stop )
retval="$?"
- splash "svc_stopped" "${service}" "${retval}"
end_service "${service}" "${retval}"
return "${retval}"
else
@@ -438,7 +429,6 @@ stop_service() {
(
( "/etc/init.d/${service}" stop )
retval="$?"
- splash "svc_stopped" "${service}" "${retval}"
end_service "${service}" "${retval}"
) &
return 0
diff --git a/sbin/runscript.sh b/sbin/runscript.sh
index a838535..bb31bfc 100755
--- a/sbin/runscript.sh
+++ b/sbin/runscript.sh
@@ -97,8 +97,7 @@ svc_stop() {
service_message "Stopping service ${myservice}"
if in_runlevel "${myservice}" "${BOOTLEVEL}" && \
- [[ ${SOFTLEVEL} != "reboot" && ${SOFTLEVEL} != "shutdown" && \
- ${SOFTLEVEL} != "single" ]]
+ [[ ${SOFTLEVEL} != "reboot" && ${SOFTLEVEL} != "shutdown" ]]
then
ewarn "WARNING: you are stopping a boot service."
fi