Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F146519821
D48856.id150511.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
770 B
Referenced Files
None
Subscribers
None
D48856.id150511.diff
View Options
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -207,15 +207,8 @@
if [ -z "$RC_LEVEL" ]; then
[ -f $cf ] || return
- if [ -s $cf ]; then
- # don't try to set RC_LEVEL without sed
- if [ -n "$SED" ]; then
- RC_LEVEL=$($SED -n '/^RC_LEVEL=/ { s/.*=//p;q; }' $cf)
- RC_LEVEL=${RC_LEVEL:-0}
- fi
- else
- RC_LEVEL=0
- fi
+ RC_LEVEL=0 # existence is 0 at least
+ sdot $cf # allow override
fi
[ ${RC_LEVEL:-0} -ge ${level:-0} ] || return
rc_log "$@"
@@ -1310,7 +1303,9 @@
_postcmd=\$${rc_arg}_postcmd
if [ -n "$_cmd" ]; then
- rc_trace 1 "$_cmd"
+ if [ "$_cmd" != : ]; then
+ rc_trace 1 "$_cmd"
+ fi
if [ -n "$_env" ]; then
eval "export -- $_env"
fi
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Mar 4, 8:23 AM (16 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29234897
Default Alt Text
D48856.id150511.diff (770 B)
Attached To
Mode
D48856: rc.subr:rc_trace take advantage of sdot
Attached
Detach File
Event Timeline
Log In to Comment