Commit Graph

54 Commits

Author SHA1 Message Date
Devin Teske
5c165dcf50 sysrc(8): Exit with failure on API error
Fix exit status when f_sysrc_set() fails. Errors in the underlying API
provided by bsdconfig(8) -- /usr/share/bsdconfig/sysrc.subr -- were not
being communicated back to the command-line. This was affecting ansible
modules using sysrc as they were not able to accurately test for error.

PR:		bin/211448
Reported by:	Christian Schwarz <me@cschwarz.com>
MFC after:	3 days
X-MFC-to:	stable/11
Sponsored by:	Smule, Inc.
2018-06-17 03:33:29 +00:00
Devin Teske
a03d5f8b02 sysrc(8): Test variable names for invalid characters
PR:		bin/187461
Reported by:	ebay@looksharp.net
MFC after:	4 weeks
X-MFC-to:	stable/11 (after 11.2-R)
Sponsored by:	Smule, Inc.
2018-05-28 23:34:23 +00:00
Enji Cooper
2c212dcc1e Change my given name from "Garrett" to "Ngie"
A legal name change from "Garrett" to "Ngie", as well as a FreeBSD
account name change, is pending.

Approved by: re (hrs)
2016-06-13 10:30:49 +00:00
Edward Tomasz Napierala
8f6e650985 jls(1) -> jls(8)
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
2016-02-29 17:30:34 +00:00
Devin Teske
97ee039909 Revert r295169 and switch \ ' to " "'
MFC after:	3 days
X-MFC-to:	stable/10
X-MFC-with:	r295169, r295170, r295173, r295177
2016-02-02 23:54:07 +00:00
Devin Teske
d2ac785ed2 Fix a typo in a comment 2016-02-02 23:51:39 +00:00
Devin Teske
0bcc841c3c Bump version to 7.1 for +=/-= fix
MFC after:	3 days
X-MFC-to:	stable/10
X-MFC-with:	r295169, r295170
2016-02-02 22:34:48 +00:00
Devin Teske
6350eae8e4 For +=/-=, add . and / to convenience characters
sysrc(8) supports key+=value and key-=value, but can be told what the
delimiter is by being passed as char1 (e.g., "sysrc key+=",value" to use a
comma as the delimiter instead of space). For convenience, if the first char
is alpha-numeric, it is assumed you wanted whitespace as the delimiter.

However, if you naively (as I just did) execute:
	sysrc rc_conf_files+=/etc/rc.conf.other
the result is unexpected.

This commit makes `.' and `/' in-addition to alpha-numeric first-characters
to cause the default of whitespace to be used as the delimiter. This also
means that you can no longer use these as a delimiter.
2016-02-02 22:18:43 +00:00
Devin Teske
613d7da7d5 Replace (Qo \ Qc) with (Qo (space) Qc)
When using col(1) piped to vim(1) as pager for man(1), the former sequence
of (Qo \  Qc) renders as "" without the space. Replace with (Qo (space) Qc)
which renders properly in more (all?) pagers.
2016-02-02 21:58:17 +00:00
Bryan Drewery
b1f92fa229 META MODE: Update dependencies with 'the-lot' and add missing directories.
This is not properly respecting WITHOUT or ARCH dependencies in target/.
Doing so requires a massive effort to rework targets/ to do so.  A
better approach will be to either include the SUBDIR Makefiles directly
and map to DIRDEPS or just dynamically lookup the SUBDIR.  These lose
the benefit of having a userland/lib, userland/libexec, etc, though and
results in a massive package.  The current implementation of targets/ is
very unmaintainable.

Currently rescue/rescue and sys/modules are still not connected.

Sponsored by:	EMC / Isilon Storage Division
2015-12-01 05:23:19 +00:00
Devin Teske
4fb1de4304 Add sysrc(8) support for "rc.conf.d" file(s) when given "-s name" to
indicate service(8) script. While here, add "-l" option for listing the
set of configuration file(s) considered (in order; separated by space).
Also add "-L" for exploring all configuration files and "-E" to omit
files that don't exist from operations.

Differential Revision:	https://reviews.freebsd.org/D3551
Reviewed by:	allanjude
MFC after:	1 week
X-MFC-to:	stable/10
Relnotes:	yes
2015-11-03 19:57:12 +00:00
Bryan Drewery
76e11fbdfc Remove redundant beforeinstall. 2015-09-18 23:34:47 +00:00
Devin Teske
8fdb5185b9 Fix mandoc(1) "WARNING: end of line whitespace"
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-03 03:58:59 +00:00
Devin Teske
3ed46372b5 Remove non-functional examples.
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-03 03:29:44 +00:00
Devin Teske
61016a614e Minor code cleanups (no functional changes).
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-02 21:53:48 +00:00
Devin Teske
9c10871d75 Bump version for altered long-opts processing
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 22:39:09 +00:00
Devin Teske
b98a26bf43 Simplify long-option processing
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 22:37:33 +00:00
Devin Teske
45d4c036ec Bump version for prior fix (SVN r287381)
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 21:52:56 +00:00
Devin Teske
c65dfe1402 Style: Remove whitespace around brackets from function syntax options
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 21:50:55 +00:00
Devin Teske
7abb307c50 Comment for escape() function.
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 21:48:22 +00:00
Devin Teske
09f28e1bf1 Comment
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 21:42:00 +00:00
Devin Teske
e84a7d105d Properly escape arguments when moving into jail or chroot
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 21:40:04 +00:00
Devin Teske
c1acb66e01 Style: comments
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 21:20:43 +00:00
Devin Teske
3d31973643 Style consistency: add single space before each `;;' case entry
MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 21:19:45 +00:00
Devin Teske
c8c3b0c498 Remove `SYSRC_' prefix from $SYSRC_VERBOSE (prefix unnecessary since
this is a non-inheritable attribute; was previously).

MFC after:	3 days
X-MFC-to:	stable/10
2015-09-01 21:18:33 +00:00
Christian Brueffer
99d43aee11 Fix a few mandoc warnings.
MFC after:	1 week
2015-08-12 10:34:05 +00:00
Devin Teske
ea15d5bb0a Update usage statement to align with post-r279624 functionality.
MFC after:	3 days
X-MFC-to:	stable/10 stable/9
2015-04-20 17:46:09 +00:00
Devin Teske
3a40fd5ebd sysrc(8): Add key-=remove' and improve key+=append' syntax
MFC after:	3 days
X-MFC-to:	stable/10 stable/9
2015-03-05 05:54:34 +00:00
Devin Teske
e8f6aafb54 Add EXAMPLES-section entry for new key+=append syntax of sysrc(8).
MFC after:	3 days
X-MFC-to:	stable/10 stable/9
X-MFC-with:	274068
Thanks to:	@SeanChittenden
2014-11-05 01:24:44 +00:00
Devin Teske
a7bdf21cf7 Add key+=append syntax to sysrc(8).
Reviewed by:	shurd
MFC after:	3 days
X-MFC-to:	stable/10 stable/9
2014-11-03 23:43:41 +00:00
Devin Teske
7ee104abde Oops, forgot to bump manual date/copyright in r268860.
MFC after:	3 days
X-MFC-to:	stable/10, stable/9, ports
X-MFC-with:	r268860
2014-07-18 23:23:52 +00:00
Devin Teske
e6c0306561 Minor enhancements, bug fixes, and man-page adjustments.
+ Make `sysrc -x foo' produce error status if foo is unset.
NB: Reported by lme (everything else ``while I'm at it'')
+ Remove mention of SYSRC_VERBOSE from `sysrc --help' output.
NB: False documentation leftover from an ancient precursor.
+ Make `sysrc -qc foo' work the same as `sysrc -ic foo' when foo is unset
NB: For syntax convenience (my fingers know `-q' more than `-i').
+ Update description of `-c' flag in help message/manual.
+ Update description of `-q' flag in help message/manual.
+ Make `sysrc -vc foo' work as documented in the manual
NB: Show message stating whether foo is currently set.
+ Make `sysrc -vc foo=1' work as documented in the manual
NB: Show message stating how value of foo would be changed (if at all).
+ Remove odd usage of parentheses in `-R dir' section of manual.
+ Clarify syntax section of manual w/respect to sysctl(8) similarities.
+ Add new/missing people to the `THANKS TO' section of the manual.

Reported by:	lme
MFC after:	3 days
X-MFC-to:	stable/10, stable/9, ports
2014-07-18 22:44:15 +00:00
Baptiste Daroussin
01c2b8ac0d use .Mt to mark up email addresses consistently (part2)
PR:		191174
Submitted by:	Franco Fichtner  <franco@lastsummer.de>
2014-06-20 09:57:27 +00:00
Devin Teske
bc3ccb9036 Revert SVN r257830 -- that feature was annoying and was removed long ago.
Was a momentary memory lapse induced by old code that was lying in my ~/bin
2013-11-21 00:54:26 +00:00
Devin Teske
f913e67483 Document SYSRC_VERBOSE enviroment variable in the manual. 2013-11-07 23:05:17 +00:00
Devin Teske
379cb6ba59 Fix a bug with -e' that broke sometime around when I added -F'. Also,
revamp the `-e' output to truly be sh(1) compatible syntax (even if
passed in `-v' for verbose output).
2013-11-07 23:04:40 +00:00
Devin Teske
671d0e72a7 Comments and whitespace. 2013-11-07 23:01:41 +00:00
Devin Teske
4cc57221da Add a -c' option for check only' to determine if a value is set
(get command) or if the current value is the same as what is desired
(set command). In those cases, the return status is success.
Otherwise, if the variable is unset (get command) or set to a different
value that what is desired (set command), returns with error status.
This is useful for puppet integration as well as everyday scripting.
2013-11-07 23:00:11 +00:00
Devin Teske
3e74984c3a Add new `--version' long option for getting the version (good for
comparing against the ports revision).
2013-11-07 22:52:10 +00:00
Devin Teske
bb28b8697d Fix a bug that prevented `-d' from working as-documented in sysrc(8).
Rather, prevent a bunch of debugging information from spewing onto the
screen when using the `describe' flag (misinterpreted as `debug' by
the automatatic initialization routines).
2013-11-07 22:47:52 +00:00
Devin Teske
8e37a7c8b9 Fix typos in the BSD License. 2013-07-07 18:51:44 +00:00
Devin Teske
385f563535 Update release info. 2013-07-05 16:49:06 +00:00
Devin Teske
18b13239a2 Update copyright/date on the back of r252798. 2013-07-05 16:47:30 +00:00
Devin Teske
b2c577b5de Update sysrc(8) manual to coincide with r252797:
Do not inherit $SYSRC_VERBOSE from operating environment. The concern is
that when a user (such as myself) which has SYSRC_VERBOSE=1 in his/her
~/.bash_profile or such that when they are told to execute a command like:

	hostname `sysrc -n hostname`

NOTE: To activate a recently configured hostname.

If $SYSRC_VERBOSE is set, then POLA is violated because the output of sysrc
is indirectly influenced (making for an inconsistent experience).
2013-07-05 16:45:25 +00:00
Devin Teske
09ee63bc6a Do not inherit $SYSRC_VERBOSE from operating environment. The concern is
that when a user (such as myself) which has SYSRC_VERBOSE=1 in his/her
~/.bash_profile or such that when they are told to execute a command like:

	hostname `sysrc -n hostname`

NOTE: To activate a recently configured hostname.

If $SYSRC_VERBOSE is set, then POLA is violated because the output of sysrc
is indirectly influenced (making for an inconsistent experience).
2013-07-05 16:21:44 +00:00
Devin Teske
efef5e5c1e Remove NO_OBJ from Makefiles that generate manuals because this causes the
GZIP compressed manuals to appear in ./src instead of the appropriate obj dir.

PR:		conf/175844
Submitted by:	Dominique Goncalves <dominique.goncalves@gmail.com>
2013-02-08 11:14:01 +00:00
Devin Teske
42cdd52718 Mirror the changes made in SVN r240798:
Replace "( : ${var?} )" syntax with better "[ ${var+set} ]" syntax.

Reviewed by:	adrian (co-mentor)
Approved by:	adrian (co-mentor)
2012-10-14 23:45:56 +00:00
Joel Dahl
3dacd67e46 mdoc: begin sentences on a new line. 2012-10-06 06:07:33 +00:00
Joel Dahl
be15d0e4dc Minor mdoc fix. 2012-10-06 06:02:29 +00:00
Joel Dahl
9a09c4db0e Remove trailing whitespace. 2012-10-06 05:54:41 +00:00