summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* - always force full file check on fbtab, login.conf, sysctl.conf andajacoutot2008-06-132-5/+20
| | | | | | | | | | ttys since they are created using helper scripts and comparing CVS Id would not be accurate original diff from sthen@ man page tweak from jmc@ ok sthen@ jdixon@ jmc@ naddy@
* Additionnal checks on the file names supplied for -s and -x.pyr2008-06-101-3/+7
| | | | | Based on a diff by ajacoutot@, ok jdixon@ and sthen@ on a previous diff, ok ajacoutot@.
* - add a sanity check on tarballs name to ensure we're not feedingajacoutot2008-06-091-3/+3
| | | | | | sysmerge with unrelated sets ok sthen@ pyr@ jdixon@
* - encourage people to use the same source as was used to upgrade systemajacoutot2008-06-091-2/+8
| | | | | | | binaries so that some etc files don't get forgotten in the process discussed with kurt@ tweaks and ok jmc@
* - remove sendmail cf files leftover after make in srcajacoutot2008-06-081-1/+6
| | | | | issue reported by jmc@ ok pyr@ jdixon@
* - enhance output for 80 columns wide terminalsajacoutot2008-06-081-4/+6
| | | | ok pyr@
* - make it possible to merge files from xetcXX onlyajacoutot2008-06-012-8/+14
| | | | | man page bits by jmc@ suggested by an ok jdixon@ merdely@
* - fix new directory creation by using the correct variable;ajacoutot2008-05-141-2/+2
| | | | | | spotted by merdely@ while trying to populate /var/www from scratch ok merdely@
* - add a non-interactive mode to sysmerge ('-b')ajacoutot2008-05-142-36/+47
| | | | | | | - yesno is only used once man page consulting jmc@ ;) ok laurent@ pyr@
* * add xetcXX.tgz support to sysmerge and handle binary filesajacoutot2008-04-302-56/+83
| | | | | | | | | | | | | | | * update man page accordingly * several cleanups in the process: - smaller sendmail configuration files diff check - remove a condition that would always evaluate to true - define AUTOMODE to a value we can reuse later - tell user when installing a file automatically - better check for src directory validity - remove full PATH to some commands to be consistent testing from several man pages bits ok jmc@ "go ahead" jasper@, ok sthen@ pyr@
* kill first personderaadt2008-04-241-3/+3
|
* - clarify copyright / licenseajacoutot2008-04-231-3/+4
| | | | | discussed with deraadt@ millert@ wording from millert@
* usage is only used once; ok millertderaadt2008-04-231-9/+3
|
* Re-indent codemillert2008-04-231-241/+240
| | | | | | Print usage to stderr not stdout Remove an unneeded check for TEMPROOT OK and last piece courtesy of ajacoutot@
* Welcome sysmerge(8), a mergemaster-based utility to help you updateajacoutot2008-04-223-0/+636
configuration files after upgrading to a new release or snapshot. The "sysmerge" name was chosen by weingart@ Lots of inputs from deraadt@ jmc@ millert@ krw@ and several, thank you! Man page enhancements by jmc@ Testings from at least okan@ landry@ gilles@ pyr@ merdely@ Still a _work-in-progress_, not connected to the build. "fine with me" krw@, "get it in" deraadt@