summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* - move the separator so it's just displayed for files with diffs tosthen2010-01-131-5/+3
| | | | | | | review, specifically it's now not printed for every auto-installed file, giving a much more compact output. ok ajacoutot@ - skip the blank line before 'Comparison complete' suggested by ajacoutot.
* xargs takes the whole list as argument, so no need to append.ajacoutot2009-12-181-4/+4
| | | | ok sthen@
* Add etcsum and xetcsum to IGNORE_FILES. Needed for upcoming change.ajacoutot2009-12-182-3/+6
| | | | ok sthen@
* Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES.ajacoutot2009-12-062-4/+13
| | | | ok sthen@
* Use BSD.x11.dist mtree file now that it is up-to-date and maintained.ajacoutot2009-10-021-1/+4
| | | | ok sthen@
* Harden variables setting, prodded by alex@ajacoutot2009-08-241-8/+11
| | | | | | | Fix TMPDIR while here and remove the EDITOR definition, it is only used once. 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-182-25/+31
| | | | | | | | | | 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++ :)"
* Don't try to move files that don't exist.ajacoutot2009-08-171-2/+4
|
* Properly initialize the array setting auto-upgradable files.ajacoutot2009-08-161-2/+5
| | | | ok sthen@
* Fix small regression introduced with symlinks handling.ajacoutot2009-06-281-3/+3
| | | | spotted by jmc@
* Remove useless blank space in output.ajacoutot2009-06-281-2/+2
|
* Teach sysmerge to deal with links (found the hard way when I realised Iajacoutot2009-06-281-12/+48
| | | | | | | | | | | | missed some very much needed symlinks under /etc/fonts/conf.d/). The behaviour is the following, if a link does not exist: * in '-a' mode, it is created automatically * in normal mode, sysmerge will ask what you want to do If one wants to use '-a' mode while still being in control of what links are created, sysmerge.ignore can be used. "sounds good to" phessler@, ok sthen@
* DBDIR resides in DESTDIR.ajacoutot2009-06-141-12/+12
| | | | ok sthen@
* tweak previous;jmc2009-06-051-3/+3
|
* When in auto-mode, automatically install binary files (from the X set).ajacoutot2009-06-042-6/+6
| | | | ``please put it in'', pyr@
* Remove unused args from getopts.ajacoutot2009-05-131-8/+2
| | | | | | Remove top comments already duplicated in the man page. "sure" sthen@
* 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-122-5/+5
| | | | | | - remove -SX from usage() ok ajacoutot
* This commit adds a new feature to sysmerge(8), usable in '-a' mode.ajacoutot2009-05-112-147/+80
| | | | | | | | | | | | | | | | | | | | | 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@
* Add the possibility to go back from merging mode to the previous menu.ajacoutot2009-04-281-16/+26
| | | | | | | | | Move unset NO_INSTALLED where it belongs, at the start of the function. Several minor cleanups. from Alexander Hall ok sthen@
* Better output (i.e. /etc instead of //etc)ajacoutot2009-04-121-6/+6
| | | | mostly from and ok sthen@
* Treat /etc/hosts the same way as /etc/group and /etc/master.passwd: makeajacoutot2009-04-121-3/+3
| | | | | | it impossible to install a virgin one over the currently installed one. from Mitja Muzenic, with a tweak
* When in automode, sysmerge will now automatically install filesajacoutot2009-04-122-63/+56
| | | | | | | | | | | 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-092-15/+27
| | | | | | | Tweak some outputs and put interesting messages into sysmerge.log. export the NEED_NEWALIASES variable. inputs from and ok sthen@
* Fix regression introduced in r1.32 where after running MAKEDEV sysmergeajacoutot2009-04-061-2/+2
| | | | | | would stop comparing files. breakage reported by and ok naddy@
* new sentence, new line;jmc2009-04-061-3/+3
|
* Add a report summary file, ${WRKDIR}/sysmerge.log, that will include allajacoutot2009-04-062-36/+41
| | | | | | | | | | | 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@
* Mitigate the risk of leaving the system in an inconsistent stateajacoutot2009-03-271-33/+23
| | | | | | | | | | | when a "special" file has been installed (e.g. master.passwd) but sysmerge was interrupted: we now run the corresponding command right after installing the file and not at the end of sysmerge run. When DESTDIR is set and a new aliases file has been installed, try to run newaliases from chrooted DESTDIR. input from and ok sthen@
* Several cleanups:ajacoutot2009-03-252-41/+40
| | | | | | | | | | | * 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-252-24/+179
| | | | | | | | | | | | | | | | 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-172-41/+17
| | | | | | | | | 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@
* - better outputajacoutot2009-02-171-4/+4
| | | | ok sthen@
* more on editors; ok ajacoutotjmc2008-12-171-5/+21
|
* - make it possible to edit a merged file using an external editor ;ajacoutot2008-12-162-6/+24
| | | | | | | useful when 'sdiff eb' does not cope with one's needs. idea and input from weerd@ ok weerd@ sthen@
* Cleanup the temporary directory in all the error paths.fgsch2008-12-151-5/+4
| | | | ajacoutot@ ok.
* - when merging a file, add a key to see a diff between the merged fileajacoutot2008-09-171-1/+13
| | | | | | | and the new or old one requested by todd@ months ago "I like the idea" fgsch@, "should be in" todd@
* - make it possible to use a user defined MERGE_CMD instead of sdiffajacoutot2008-09-122-9/+19
| | | | | | mostly from andreas@ man page enhancing by jmc@ ok andreas@
* - use shell built-in getopts instead of getopt(1)ajacoutot2008-09-121-47/+47
| | | | | | | - cleanup by adding usage and error_rm_wrkdir functions feedbacks from guenther@ sthen@ and jared r r spiegel, thank you! ok sthen
* - don't list *.merged files in the "remaining for you to merge by hand"ajacoutot2008-09-061-2/+2
| | | | | | list, it's very confusing. ok sthen@
* - make sure they are no sendmail leftovers in src when sysmerge stopsajacoutot2008-09-021-6/+10
| | | | | | unexpectedly feedback and ok sthen@
* - prevent sysmerge from installing a virgin master.passwd and groupajacoutot2008-08-291-6/+14
| | | | | | | files (only allow delete or merge+install); requested by nick@ no objections from laurent@ krw@ oga@ ok sthen@ nick@
* Leave PATH alone.ajacoutot2008-07-211-2/+1
| | | | noticed by and ok deraadt@
* Fix "etc source" output when not using a tarballajacoutot2008-07-101-3/+5
| | | | ok "bien sur!" sthen@
* Typo in summarize output.ajacoutot2008-07-081-2/+2
| | | | ok sthen@
* Teach sysmerge to retrieve {etc,xetc}*.tgz files from FTP/HTTPsthen2008-07-042-14/+55
| | | | | | 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
|
* - don't ask for yesno confirmation when running in automatic modeajacoutot2008-06-131-12/+10
| | | | | | - allow comments in sysmerge.ignore suggested by, feedback from and ok naddy@
* - add support for ignoring files and directories from comparisonajacoutot2008-06-132-3/+14
| | | | | | | | | | 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@
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.