summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge/sysmerge.8 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Mention PAGER behavior when undefined/empty.ajacoutot2016-09-061-2/+7
| | | | | from Michael Reed ok jmc@
* move links from http to https://www.openbsd.org/tb2016-09-021-4/+4
| | | | ok beck
* Remove handling of /etc/examples/ files by sysmerge(8). Getting regular messagesajacoutot2016-05-141-8/+2
| | | | | | | | about pkg.conf isn't really that helpful and if a big syntax change comes along well we have current.html. it was disabled during p2k16 and no one complained so far discussed with and ok deraadt@
* sysmerge(8) is the bastard child of ksh and perl, so just call it a "utility".ajacoutot2016-04-271-5/+3
|
* No more /etc/mail/aliases.db.ajacoutot2016-01-141-3/+2
|
* Drop usage of TMPDIR.ajacoutot2015-10-161-12/+4
| | | | | While here, stop refering to /tmp/sysmerge.XXXXXXXXXX, that's a script internal we don't need to know about.
* Simplify: we don't need a work directory anymore, temproot is enough.ajacoutot2015-09-181-14/+6
|
* Simplify handling of sum files.ajacoutot2015-09-071-7/+6
|
* Make backup directory of replaced files persistent: /var/sysmerge/backups.ajacoutot2015-08-241-11/+14
| | | | | | | | | 3 rotations so that we have history of modified files. In batch mode, when a file cannot be handled automatically, remove it from the checksum file so that the next interactive sysmerge(8) run will ask to merge the changes. ok rpe@
* /usr/share/sysmerge -> /var/sysmergeajacoutot2015-08-241-7/+7
| | | | | requested by several discussed with deraadt@
* use file system path (.Pa) semantic markup macros where appropriate.sobrado2015-07-271-6/+6
| | | | ok jmc@
* Drop sysmerge.log ; it used to be handy for batch mode but now theajacoutot2014-11-261-11/+5
| | | | | | | | | | | | console output is clear and clean in that mode. Since /var/tmp is now a symlink to /tmp: - directly use /tmp - if modifications were done; at the end of the run: - display our backup directory (in case we want to move it to survive a reboot) - display where and what files are still left for comparison discussed with and ok sthen@
* Drop support for SM_MERGE. The goal is to be a less interactive as possibleajacoutot2014-09-051-12/+3
| | | | | so there is no point in allowing graphical merge tools to be used; especially since it is _completely_ untested...
* Drop support for sendmail(8) -- hopefully it'll go away from base soon.ajacoutot2014-09-051-16/+6
|
* tweak previous;jmc2014-09-051-2/+2
|
* /etc/{hosts,myname} are going away from etc.tgz.ajacoutot2014-09-051-4/+5
|
* Indent.ajacoutot2014-08-301-3/+3
|
* knock out double .Pp;jmc2014-08-291-3/+2
|
* Merge a paragraph.ajacoutot2014-08-281-9/+8
|
* tweak AUTHORS; ok ajacoutotjmc2014-08-281-3/+3
|
* Major sysmerge cleanup now that both etc and xetc sets are part of base.ajacoutot2014-08-281-82/+33
| | | | | | | | | | | | | Expect more changes/cleanup/... in the near future. -S (signature) option is gone since we are not fetching sets anymore -s and -x are gone as well for obvious reasons Left is: usage: sysmerge [-bdp] I would appreciate feedback, *lots* of things have changed and there may be side effects I missed. Consider sysmerge as WIP for the time being.
* Fist shot at fixing sysmerge(8) with etc-in-base; note that it's still inajacoutot2014-08-261-41/+23
| | | | | transition state and the utility will get a lot of revamping in the near future.
* Steal stripcom() from /etc/rc to parse sysmerge.ignore.ajacoutot2014-08-111-5/+3
|
* Move a sentence to the corresponding option description.ajacoutot2014-08-111-9/+6
| | | | from jmc@
* - add -p to SYNOPSISjmc2014-08-101-5/+4
| | | | | | - the argument to -s is not optional ok ajacoutot
* less chatty; ok ajacoutotjmc2014-08-091-7/+5
|
* Initial support for handling configuration files from packagesajacoutot2014-08-091-1/+15
| | | | | | | | | (aka @sample) -- `sysmerge -p` Worked done at g2k14. Committing early so we have plenty of time for testing. with help from espie@ thanks to landry@ for feedback on initial testing
* sysctl.conf is an example.ajacoutot2014-08-091-2/+3
| | | | | Tweak error output. Mention that `-S' has no effect when sets aren't used.
* Drop some useless verbiage.ajacoutot2014-08-081-17/+6
| | | | sysctl.conf is an example now.
* /var/db/sysmerge -> /usr/share/sysmergeajacoutot2014-07-151-6/+6
| | | | ok deraadt@
* Also ignore examplessum.ajacoutot2014-07-131-2/+3
|
* Extend output a bit.ajacoutot2014-07-121-3/+5
|
* Initial support for /etc/examples.ajacoutot2014-07-121-2/+8
|
* /var/games/tetris.scores will move away from the etc set.ajacoutot2014-07-101-3/+2
|
* login.conf(5) is not special anymore.ajacoutot2014-03-261-3/+2
|
* Drop comma (sthen@).ajacoutot2014-01-281-2/+2
|
* Drop FETCH_CMD and always use ftp(1).ajacoutot2014-01-281-24/+12
| | | | | | | | New fetch() function that wraps ftp(1) with our needed knobs (courtesy of halex@) input from halex@ rpe@ ok halex@
* Make it clear SM_PATH will fetch the sets corresponding to the currentlyajacoutot2014-01-271-4/+4
| | | | running release.
* Document -S and the new signify(1) use by sysmerge(8).ajacoutot2014-01-211-4/+12
| | | | input and ok jmc@
* Add support for the SM_PATH environment variable. This changes theajacoutot2013-09-101-5/+14
| | | | | | | | | | | | | | default behavior of sysmerge when no source is specified on the command line: * if SM_PATH is set, then sysmerge will search this path for etcXX.tgz and/or xetcXX.tgz * if SM_PATH is not set (the default), then the behaviour is the same as before and /usr/src is used idea from espie@ man page refactoring jmc@ (who else :-)) "good idea" krw@ ok rpe@ landry@ espie@
* use .Mt for email addresses; from Jan Stary <hans at stare dot cz>; ok jmc@schwarze2013-07-161-4/+4
|
* Always compare master.passwd(5) and group(5) regardless of their sums:ajacoutot2012-08-281-3/+5
| | | | | | this is a sanity check to ensure no system user(s)/group(s) are missing. ok sthen@
* use Lk for links;jmc2012-08-151-4/+4
|
* Remove the backup chunk from the man page. People should use backupajacoutot2012-02-171-8/+2
| | | | | | anyway and sysmerge(8) automatically save replaced files. ok sthen@
* Adjust work directory name.ajacoutot2011-07-211-5/+5
|
* Missed that part in previous.ajacoutot2010-11-111-2/+2
| | | | from jmc@
* Unconfuse usage.ajacoutot2010-11-111-3/+3
| | | | prodded by and ok espie@, ok jmc@
* Automatically install missing users and groups.ajacoutot2010-07-051-2/+10
| | | | | | | | (does *NOT* touch existing users/groups) "I like it" from several... inputs from sthen@ and halex@ ok krw@ halex@ sthen@
* s/sh/ksh/ajacoutot2010-03-201-3/+3
|
* Add etcsum and xetcsum to IGNORE_FILES. Needed for upcoming change.ajacoutot2009-12-181-2/+4
| | | | ok sthen@