Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some errors in the way scripts with "KEYWORD: interactive"

Browse Source 
are handled.  There was an inverted test, and "set $_args"
had the wrong scope (in several nearly-identical blocks of code).
This commit is contained in:
apb 2009-09-14 22:30:30 +00:00
parent c1a508d11c
commit 1e2ed7f3ca
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/rc.subr
View File

@ -1,4 +1,4 @@
# $NetBSD: rc.subr,v 1.79 2009/09/14 12:05:12 apb Exp $
# $NetBSD: rc.subr,v 1.80 2009/09/14 22:30:30 apb Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@ -802,7 +802,7 @@ run_rc_script()
eval unset ${_arg}_cmd ${_arg}_precmd ${_arg}_postcmd
_must_redirect=false
if ! [ -n "${_rc_postprocessor_fd}" ] \
if [ -n "${_rc_postprocessor_fd}" ] \
&& _has_rcorder_keyword interactive $_file
then
_must_redirect=true
@ -813,7 +813,8 @@ run_rc_script()
if $_must_redirect; then
print_rc_metadata \
"note:Output from ${_file} is not logged"
set $_arg ; no_rc_postprocess . $_file
no_rc_postprocess eval \
'set $_arg ; . $_file'
else
set $_arg ; . $_file
fi
@ -826,9 +827,11 @@ run_rc_script()
print_rc_metadata \
"note:Output from ${_file} is not logged"
if [ -n "$rc_fast_and_loose" ]; then
set $_arg ; no_rc_postprocess . $_file
no_rc_postprocess eval \
'set $_arg ; . $_file'
else
( set $_arg ; no_rc_postprocess . $_file )
no_rc_postprocess eval \
'( set $_arg ; . $_file )'
fi
elif [ -x $_file ]; then
if [ -n "$rc_fast_and_loose" ]; then