summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge/sysmerge.8 (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES.ajacoutot2009-12-061-2/+4
| | | | ok sthen@
* Document all variables used by sysmerge.ajacoutot2009-08-231-2/+14
| | | | "fine" jmc@
* HEADS-UP: change the way sysmerge(8) runs by default.ajacoutot2009-08-181-13/+19
| | | | | | | | | | Remove the '-a' switch (auto-mode) and make this behaviour the default. Add a new '-d' switch to get former default (full diff) mode. General idea ok for several. man page improvements from jmc@ ok jim@ oga@ sobrado@ ok sthen@ "sane defaults++ :)"
* tweak previous;jmc2009-06-051-3/+3
|
* When in auto-mode, automatically install binary files (from the X set).ajacoutot2009-06-041-3/+3
| | | | ``please put it in'', pyr@
* simplify the descriptions of -a and -b; this has taken me and antoinejmc2009-05-121-15/+12
| | | | | | an entire day of mailing to make this tweak ;( ok ajacoutot
* - tweak the description of -ajmc2009-05-121-3/+3
| | | | | | - remove -SX from usage() ok ajacoutot
* This commit adds a new feature to sysmerge(8), usable in '-a' mode.ajacoutot2009-05-111-31/+10
| | | | | | | | | | | | | | | | | | | | | From now on, checksums of reference files (sets and/or src) will be stored under /var/db/sysmerge/{etcsum,xetcsum,srcsum} . This allows for "remembering last choice" several people have requested. This deprecates the need for -X and -S which have been removed (these switches may come back at some point for the auto-patch feature which halex@ proposed). It will only compare files which reference sources have changed since the last run and will attempt to automatically upgrade them to the newest version provided that they have no local changes. i.e. first run should dislay differences, second run should not display anything except if something changed between old and new sets/src. This way sysmerge can also warn you from files which may have been obsoleted. General idea taken from Net/FreeBSD but we're doing things differently. Intensively discussed with oga@, sthen@ and halex@ ok oga@ sthen@
* When in automode, sysmerge will now automatically install filesajacoutot2009-04-121-62/+42
| | | | | | | | | | | that only differ by CVS Id (adapted from FreeBSD mergemaster) Ground work on the man page, from jmc@ * do not duplicate info * rewordings * move some stuffs around ok jmc@ sthen@
* Sort.ajacoutot2009-04-091-2/+2
| | | | requested by jmc@
* Add a hook to deal with special sendmail db files under /etc/mail/ajacoutot2009-04-091-2/+3
| | | | | | | Tweak some outputs and put interesting messages into sysmerge.log. export the NEED_NEWALIASES variable. inputs from and ok sthen@
* new sentence, new line;jmc2009-04-061-3/+3
|
* Add a report summary file, ${WRKDIR}/sysmerge.log, that will include allajacoutot2009-04-061-5/+14
| | | | | | | | | | | worthy post run information instead of spreading info into several files. Tweak some output while here. Enchance description for the -S and -X options; thanks to sthen@ and jmc@ for finding the correct wording... it was not as easy as it seems. Fix a typo in the man page, spotted by jmc@ ok sthen@ jmc@
* Several cleanups:ajacoutot2009-03-251-6/+6
| | | | | | | | | | | * constistency in redirections (and fix a wrong one) * enclose variables * several UPPER -> lowercase rewordings * add "" on conditionals (suggested by jared r r spiegel a while ago) * use cmp instead of md5 for sets comparison (from sthen@) * some man page rewordings from sthen@ ok sthen@
* You can now feed sysmerge with an etcXX and/or xetcXX tarball(s)ajacoutot2009-03-251-2/+37
| | | | | | | | | | | | | | | | corresponding to your current snapshot or release. Any file that was modified between this old reference and the new one *and* that you did not change locally will automatically be updated to the new version. Make sure we don't compare files that have not changed between old and new tarball (from Alexander Hall). man page flushing, tweaking, rewording and enhancing from jmc@ Several people came up with this request or alike, thanks to them. looked over and tested by several ok weerd@
* - always run pwd_mdb, newaliases, MAKEDEV and cap_mkdb even when not inajacoutot2009-02-171-12/+6
| | | | | | | | | auto-mode so that the system is not left in an inconsistent state - unify messages - tweak manpage according to new behavior based on an initial patch from matthieu@ ok matthieu@
* more on editors; ok ajacoutotjmc2008-12-171-5/+21
|
* - make it possible to edit a merged file using an external editor ;ajacoutot2008-12-161-3/+4
| | | | | | | useful when 'sdiff eb' does not cope with one's needs. idea and input from weerd@ ok weerd@ sthen@
* - make it possible to use a user defined MERGE_CMD instead of sdiffajacoutot2008-09-121-4/+11
| | | | | | mostly from andreas@ man page enhancing by jmc@ ok andreas@
* Teach sysmerge to retrieve {etc,xetc}*.tgz files from FTP/HTTPsthen2008-07-041-4/+9
| | | | | | paths using ftp(1). Thanks ajacoutot and jmc for suggestions. ok ajacoutot jmc, no objection deraadt
* some small text improvements; ok ajacoutotjmc2008-07-041-9/+12
|
* - add support for ignoring files and directories from comparisonajacoutot2008-06-131-1/+7
| | | | | | | | | | 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@
* - always force full file check on fbtab, login.conf, sysctl.conf andajacoutot2008-06-131-2/+12
| | | | | | | | | | 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@
* - 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@
* - make it possible to merge files from xetcXX onlyajacoutot2008-06-011-4/+10
| | | | | man page bits by jmc@ suggested by an ok jdixon@ merdely@
* - add a non-interactive mode to sysmerge ('-b')ajacoutot2008-05-141-3/+9
| | | | | | | - yesno is only used once man page consulting jmc@ ;) ok laurent@ pyr@
* * add xetcXX.tgz support to sysmerge and handle binary filesajacoutot2008-04-301-3/+10
| | | | | | | | | | | | | | | * 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
|
* Welcome sysmerge(8), a mergemaster-based utility to help you updateajacoutot2008-04-221-0/+182
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@
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.