summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
AgeCommit message (Collapse)Author
2008-07-21Leave PATH alone.Antoine Jacoutot
noticed by and ok deraadt@
2008-07-10Fix "etc source" output when not using a tarballAntoine Jacoutot
ok "bien sur!" sthen@
2008-07-08Typo in summarize output.Antoine Jacoutot
ok sthen@
2008-07-04Teach sysmerge to retrieve {etc,xetc}*.tgz files from FTP/HTTPStuart Henderson
paths using ftp(1). Thanks ajacoutot and jmc for suggestions. ok ajacoutot jmc, no objection deraadt
2008-07-04some small text improvements; ok ajacoutotJason McIntyre
2008-06-13- don't ask for yesno confirmation when running in automatic modeAntoine Jacoutot
- allow comments in sysmerge.ignore suggested by, feedback from and ok naddy@
2008-06-13- add support for ignoring files and directories from comparisonAntoine Jacoutot
through an optionnal /etc/sysmerge.ignore file requested by many man page tweak from jmc@ /etc/changelist addition suggested by sthen@ ok sthen@ jdixon@ jmc@ naddy@
2008-06-13- always force full file check on fbtab, login.conf, sysctl.conf andAntoine Jacoutot
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@
2008-06-10Additionnal checks on the file names supplied for -s and -x.Pierre-Yves Ritschard
Based on a diff by ajacoutot@, ok jdixon@ and sthen@ on a previous diff, ok ajacoutot@.
2008-06-09- add a sanity check on tarballs name to ensure we're not feedingAntoine Jacoutot
sysmerge with unrelated sets ok sthen@ pyr@ jdixon@
2008-06-09- encourage people to use the same source as was used to upgrade systemAntoine Jacoutot
binaries so that some etc files don't get forgotten in the process discussed with kurt@ tweaks and ok jmc@
2008-06-08- remove sendmail cf files leftover after make in srcAntoine Jacoutot
issue reported by jmc@ ok pyr@ jdixon@
2008-06-08- enhance output for 80 columns wide terminalsAntoine Jacoutot
ok pyr@
2008-06-01- make it possible to merge files from xetcXX onlyAntoine Jacoutot
man page bits by jmc@ suggested by an ok jdixon@ merdely@
2008-05-14- fix new directory creation by using the correct variable;Antoine Jacoutot
spotted by merdely@ while trying to populate /var/www from scratch ok merdely@
2008-05-14- add a non-interactive mode to sysmerge ('-b')Antoine Jacoutot
- yesno is only used once man page consulting jmc@ ;) ok laurent@ pyr@
2008-04-30* add xetcXX.tgz support to sysmerge and handle binary filesAntoine Jacoutot
* 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@
2008-04-24kill first personTheo de Raadt
2008-04-23- clarify copyright / licenseAntoine Jacoutot
discussed with deraadt@ millert@ wording from millert@
2008-04-23usage is only used once; ok millertTheo de Raadt
2008-04-23Re-indent codeTodd C. Miller
Print usage to stderr not stdout Remove an unneeded check for TEMPROOT OK and last piece courtesy of ajacoutot@
2008-04-22Welcome sysmerge(8), a mergemaster-based utility to help you updateAntoine Jacoutot
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@