|
Lines 41-55
Link Here
|
| 41 |
# configuration, if the system administrator chose to put it |
41 |
# configuration, if the system administrator chose to put it |
| 42 |
# there (if it exists). |
42 |
# there (if it exists). |
| 43 |
|
43 |
|
| 44 |
[ -e /etc/conf.d/basic ] && source /etc/conf.d/basic |
44 |
[ -e `add_suffix /etc/conf.d/basic` ] && source `add_suffix /etc/conf.d/basic` |
| 45 |
|
45 |
|
| 46 |
[ -e "/etc/conf.d/${myservice}" ] && source "/etc/conf.d/${myservice}" |
46 |
[ -e `add_suffix "/etc/conf.d/${myservice}"` ] && \ |
|
|
47 |
source `add_suffix "/etc/conf.d/${myservice}"` |
| 47 |
|
48 |
|
| 48 |
[ -e /etc/conf.d/net ] && \ |
49 |
[ -e `add_suffix /etc/conf.d/net` ] && \ |
| 49 |
[ "${myservice%%.*}" = "net" ] && \ |
50 |
[ "${myservice%%.*}" = "net" ] && \ |
| 50 |
[ "${myservice##*.}" != "${myservice}" ] && source /etc/conf.d/net |
51 |
[ "${myservice##*.}" != "${myservice}" ] && source `add_suffix /etc/conf.d/net` |
| 51 |
|
52 |
|
| 52 |
[ -e /etc/rc.conf ] && source /etc/rc.conf |
53 |
[ -e `add_suffix /etc/rc.conf` ] && source `add_suffix /etc/rc.conf` |
| 53 |
|
54 |
|
| 54 |
usage() { |
55 |
usage() { |
| 55 |
local IFS="|" |
56 |
local IFS="|" |
|
Lines 108-114
Link Here
|
| 108 |
if [ "${NETSERVICE}" = "yes" ] |
109 |
if [ "${NETSERVICE}" = "yes" ] |
| 109 |
then |
110 |
then |
| 110 |
# A net.* service |
111 |
# A net.* service |
| 111 |
if [ -L "/etc/runlevels/boot/${myservice}" -o \ |
112 |
if [ -L "/etc/runlevels/${BOOTLEVEL}/${myservice}" -o \ |
| 112 |
-L "/etc/runlevels/${mylevel}/${myservice}" ] |
113 |
-L "/etc/runlevels/${mylevel}/${myservice}" ] |
| 113 |
then |
114 |
then |
| 114 |
local netcount="$(ls -1 "${svcdir}"/started/net.* 2> /dev/null | \ |
115 |
local netcount="$(ls -1 "${svcdir}"/started/net.* 2> /dev/null | \ |
|
Lines 242-248
Link Here
|
| 242 |
do |
243 |
do |
| 243 |
if [ "${x}" = "net" ] |
244 |
if [ "${x}" = "net" ] |
| 244 |
then |
245 |
then |
| 245 |
local netservlist="$(dolisting "/etc/runlevels/boot/net.*") \ |
246 |
local netservlist="$(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \ |
| 246 |
$(dolisting "/etc/runlevels/${mylevel}/net.*")" |
247 |
$(dolisting "/etc/runlevels/${mylevel}/net.*")" |
| 247 |
|
248 |
|
| 248 |
for y in ${netservlist} |
249 |
for y in ${netservlist} |
|
Lines 310-316
Link Here
|
| 310 |
# Remove link if service didn't start; but only if we're not booting |
311 |
# Remove link if service didn't start; but only if we're not booting |
| 311 |
# if we're booting, we need to continue and do our best to get the |
312 |
# if we're booting, we need to continue and do our best to get the |
| 312 |
# system up. |
313 |
# system up. |
| 313 |
if [ "${retval}" -ne "0" -a "${SOFTLEVEL}" != "boot" ] |
314 |
if [ "${retval}" -ne "0" -a "${SOFTLEVEL}" != "${BOOTLEVEL}" ] |
| 314 |
then |
315 |
then |
| 315 |
rm -f "${svcdir}/started/${myservice}" |
316 |
rm -f "${svcdir}/started/${myservice}" |
| 316 |
fi |
317 |
fi |
|
Lines 441-447
Link Here
|
| 441 |
local y="" |
442 |
local y="" |
| 442 |
for x in $(iuse "$1") |
443 |
for x in $(iuse "$1") |
| 443 |
do |
444 |
do |
| 444 |
if [ -e "/etc/runlevels/boot/${x}" -o \ |
445 |
if [ -e "/etc/runlevels/${BOOTLEVEL}/${x}" -o \ |
| 445 |
-e "/etc/runlevels/${mylevel}/${x}" ] |
446 |
-e "/etc/runlevels/${mylevel}/${x}" ] |
| 446 |
then |
447 |
then |
| 447 |
z="${x%/*}" |
448 |
z="${x%/*}" |
|
Lines 472-478
Link Here
|
| 472 |
local y="" |
473 |
local y="" |
| 473 |
for x in $(iafter "$1") |
474 |
for x in $(iafter "$1") |
| 474 |
do |
475 |
do |
| 475 |
if [ -e "/etc/runlevels/boot/${x}" -o \ |
476 |
if [ -e "/etc/runlevels/${BOOTLEVEL}/${x}" -o \ |
| 476 |
-e "/etc/runlevels/${mylevel}/${x}" ] |
477 |
-e "/etc/runlevels/${mylevel}/${x}" ] |
| 477 |
then |
478 |
then |
| 478 |
z="${x%/*}" |
479 |
z="${x%/*}" |
