diff options
| author | dteske <dteske@FreeBSD.org> | 2013-11-21 03:38:47 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2013-11-21 03:38:47 +0000 |
| commit | 7f36b7bf087251733bd30c159e873d5bd427ed53 (patch) | |
| tree | aae33fabe9f1e42be0a42e4ffb105e726fff344b /usr.sbin/bsdconfig/share/sysrc.subr | |
| parent | a2ed0ef7f6d3effa506eee672d738f5ec99b5254 (diff) | |
| download | FreeBSD-src-7f36b7bf087251733bd30c159e873d5bd427ed53.zip FreeBSD-src-7f36b7bf087251733bd30c159e873d5bd427ed53.tar.gz | |
MFC r257755-257756,257780-257785,257787-257793, and
257795,257817,257819,257937-257938,258029,258263-258267:
257755: SRV records
257756: fix spurious error message
257780: Whitespace
257781: Comments and funny syntax
257782: Debug file truncation is optional
257783: f_show_err for debugging
257784: f_eval_catch for debugging
257785: fix size calculations bug
257787: fix broken HTTP "any" media type
257788: more debugging
257789: Comments
257790: fix printf usage bug
257791: f_[v]sprintf added
257792: Comments
257793: fix off-by-one error in size calcs
257795: Replace pkg-tools with pkgng
257817: fix cosmetic typos
257819: Use `pkg -vv' to get ABI
257937: Adjustment to last
257938: Adjustment to last
258029: Comments
258263: Shuffle code around
258264: Remove unused code
258265: Debugging. Use f_eval_catch with pkg
258266: Shutdown media on exit from packages
258267: Fix pkg install from DVD
Reviewed by: many
Discussed on: -current
Approved by: re (hrs)
Diffstat (limited to 'usr.sbin/bsdconfig/share/sysrc.subr')
| -rw-r--r-- | usr.sbin/bsdconfig/share/sysrc.subr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdconfig/share/sysrc.subr b/usr.sbin/bsdconfig/share/sysrc.subr index 66a4cf3..c1bd0e2 100644 --- a/usr.sbin/bsdconfig/share/sysrc.subr +++ b/usr.sbin/bsdconfig/share/sysrc.subr @@ -118,8 +118,8 @@ f_clean_env() # f_sysrc_get $varname # # Get a system configuration setting from the collection of system- -# configuration files (in order: /etc/defaults/rc.conf /etc/rc.conf -# and /etc/rc.conf). +# configuration files (in order: /etc/defaults/rc.conf /etc/rc.conf and +# /etc/rc.conf.local) # # NOTE: Additional shell parameter-expansion formats are supported. For # example, passing an argument of "hostname%%.*" (properly quoted) will |
