/[vps]/baselayout-vserver/branches/baselayout-1_12/sbin/rc
Gentoo

Diff of /baselayout-vserver/branches/baselayout-1_12/sbin/rc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 205 Revision 206
144 # should help speed things up a bit 144 # should help speed things up a bit
145 rm -rf $(ls -d1 "${svcdir}/"* 2>/dev/null | \ 145 rm -rf $(ls -d1 "${svcdir}/"* 2>/dev/null | \
146 grep -ve '\(depcache\|deptree\|envcache\)') 146 grep -ve '\(depcache\|deptree\|envcache\)')
147 147
148 echo "sysinit" > "${svcdir}/softlevel" 148 echo "sysinit" > "${svcdir}/softlevel"
149 echo "${interactive}" > "${svcdir}/interactive"
150 149
151 # Update the dependency cache 150 # Update the dependency cache
152 /sbin/depscan.sh -u 151 /sbin/depscan.sh -u
153 152
154 # Now that the dependency cache are up to date, make sure these 153 # Now that the dependency cache are up to date, make sure these
193 # if there is one 192 # if there is one
194 argv1="${BOOTLEVEL}" 193 argv1="${BOOTLEVEL}"
195fi 194fi
196 195
197source "${svclib}/sh/rc-services.sh" 196source "${svclib}/sh/rc-services.sh"
197[[ -e "${svcdir}/interactive" ]] \
198 && svcinteractive="$(<${svcdir}/interactive)"
198 199
199if [ -f "${svcdir}/softlevel" ] 200if [ -f "${svcdir}/softlevel" ]
200then 201then
201 # Set OLDSOFTLEVEL if we had a valid SOFTLEVEL 202 # Set OLDSOFTLEVEL if we had a valid SOFTLEVEL
202 export OLDSOFTLEVEL="$(< ${svcdir}/softlevel)" 203 export OLDSOFTLEVEL="$(< ${svcdir}/softlevel)"
317 else 318 else
318 # Something may depend on me 319 # Something may depend on me
319 needsme=0 320 needsme=0
320 321
321 for dep in $(needsme "${myservice}") ; do 322 for dep in $(needsme "${myservice}") ; do
322 #if service_started "${dep}" && \
323 if [[ -L "${svcdir}/softscripts.new/${dep}" ]] ; then 323 if [[ -L "${svcdir}/softscripts.new/${dep}" ]] ; then
324 # This dep is valid 324 # This dep is valid
325 needsme=1 325 needsme=1
326 326
327 break 327 break
337 ${SOFTLEVEL} != "shutdown" ]] 337 ${SOFTLEVEL} != "shutdown" ]]
338then 338then
339 for i in $(get_stop_services) ; do 339 for i in $(get_stop_services) ; do
340 dep_stop "${i}" 340 dep_stop "${i}"
341 done 341 done
342 342
343 # Wait for any services that may still be stopping ... 343 # Wait for any services that may still be stopping ...
344 [ "${RC_PARALLEL_STARTUP}" = "yes" ] && wait 344 [ "${RC_PARALLEL_STARTUP}" = "yes" ] && wait
345else 345else
346 get_critical_services 346 get_critical_services
347 347

Legend:
Removed from v.205  
changed lines
  Added in v.206

  ViewVC Help
Powered by ViewVC 1.1.20