diff options
| -rw-r--r-- | etc/conf.d/rc | 19 | ||||
| -rwxr-xr-x | sbin/rc-services.sh | 10 | ||||
| -rwxr-xr-x | sbin/runscript.sh | 3 |
3 files changed, 1 insertions, 31 deletions
diff --git a/etc/conf.d/rc b/etc/conf.d/rc index bbba288..af260ea 100644 --- a/etc/conf.d/rc +++ b/etc/conf.d/rc @@ -86,22 +86,3 @@ RC_WAIT_ON_START="0.1" # svcdir="/var/lib/init.d" svcdir="/var/lib/init.d" - - -# Should we mount $svcdir in a ram disk for some speed increase -# for slower machines, or for the more extreme setups ? - -svcmount="no" - - -# FS type that should be used for $svcdir. Note that you need -# $svcmount above set to "yes" for this to work ... Currently -# tmpfs, ramfs, and ramdisk are supported (tmpfs is the default). - -svcfstype="tmpfs" - - -# Size of $svcdir in KB. Note that ramfs doesn't support this -# due to kernel limitations. - -svcsize=2048 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 |