![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.sbin / sysmerge
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.79 / (download) - annotate - [select for diffs], Tue Sep 6 12:32:13 2016 UTC (7 years, 9 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2,
OPENBSD_6_1_BASE,
OPENBSD_6_1,
HEAD
Changes since 1.78: +7 -2 lines
Diff to previous 1.78 (colored)
Mention PAGER behavior when undefined/empty. from Michael Reed ok jmc@
Revision 1.78 / (download) - annotate - [select for diffs], Fri Sep 2 12:17:33 2016 UTC (7 years, 9 months ago) by tb
Branch: MAIN
Changes since 1.77: +4 -4 lines
Diff to previous 1.77 (colored)
move links from http to https://www.openbsd.org/ ok beck
Revision 1.77 / (download) - annotate - [select for diffs], Sat May 14 14:44:35 2016 UTC (8 years ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE,
OPENBSD_6_0
Changes since 1.76: +2 -8 lines
Diff to previous 1.76 (colored)
Remove handling of /etc/examples/ files by sysmerge(8). Getting regular messages 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@
Revision 1.76 / (download) - annotate - [select for diffs], Wed Apr 27 21:04:34 2016 UTC (8 years, 1 month ago) by ajacoutot
Branch: MAIN
Changes since 1.75: +3 -5 lines
Diff to previous 1.75 (colored)
sysmerge(8) is the bastard child of ksh and perl, so just call it a "utility".
Revision 1.75 / (download) - annotate - [select for diffs], Thu Jan 14 19:58:32 2016 UTC (8 years, 4 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.74: +2 -3 lines
Diff to previous 1.74 (colored)
No more /etc/mail/aliases.db.
Revision 1.74 / (download) - annotate - [select for diffs], Fri Oct 16 19:55:39 2015 UTC (8 years, 7 months ago) by ajacoutot
Branch: MAIN
Changes since 1.73: +4 -12 lines
Diff to previous 1.73 (colored)
Drop usage of TMPDIR. While here, stop refering to /tmp/sysmerge.XXXXXXXXXX, that's a script internal we don't need to know about.
Revision 1.73 / (download) - annotate - [select for diffs], Fri Sep 18 17:03:44 2015 UTC (8 years, 8 months ago) by ajacoutot
Branch: MAIN
Changes since 1.72: +6 -14 lines
Diff to previous 1.72 (colored)
Simplify: we don't need a work directory anymore, temproot is enough.
Revision 1.72 / (download) - annotate - [select for diffs], Mon Sep 7 10:02:04 2015 UTC (8 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.71: +5 -6 lines
Diff to previous 1.71 (colored)
Simplify handling of sum files.
Revision 1.71 / (download) - annotate - [select for diffs], Mon Aug 24 11:03:41 2015 UTC (8 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.70: +15 -12 lines
Diff to previous 1.70 (colored)
Make backup directory of replaced files persistent: /var/sysmerge/backups. 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@
Revision 1.70 / (download) - annotate - [select for diffs], Mon Aug 24 10:42:08 2015 UTC (8 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.69: +7 -7 lines
Diff to previous 1.69 (colored)
/usr/share/sysmerge -> /var/sysmerge requested by several discussed with deraadt@
Revision 1.69 / (download) - annotate - [select for diffs], Mon Jul 27 17:28:40 2015 UTC (8 years, 10 months ago) by sobrado
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8
Changes since 1.68: +6 -6 lines
Diff to previous 1.68 (colored)
use file system path (.Pa) semantic markup macros where appropriate. ok jmc@
Revision 1.68 / (download) - annotate - [select for diffs], Wed Nov 26 15:52:30 2014 UTC (9 years, 6 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.67: +4 -10 lines
Diff to previous 1.67 (colored)
Drop sysmerge.log ; it used to be handy for batch mode but now the 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@
Revision 1.67 / (download) - annotate - [select for diffs], Fri Sep 5 17:26:08 2014 UTC (9 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.66: +3 -12 lines
Diff to previous 1.66 (colored)
Drop support for SM_MERGE. The goal is to be a less interactive as possible so there is no point in allowing graphical merge tools to be used; especially since it is _completely_ untested...
Revision 1.66 / (download) - annotate - [select for diffs], Fri Sep 5 17:19:48 2014 UTC (9 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.65: +6 -16 lines
Diff to previous 1.65 (colored)
Drop support for sendmail(8) -- hopefully it'll go away from base soon.
Revision 1.65 / (download) - annotate - [select for diffs], Fri Sep 5 10:35:31 2014 UTC (9 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.64: +3 -3 lines
Diff to previous 1.64 (colored)
tweak previous;
Revision 1.64 / (download) - annotate - [select for diffs], Fri Sep 5 07:16:38 2014 UTC (9 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.63: +5 -4 lines
Diff to previous 1.63 (colored)
/etc/{hosts,myname} are going away from etc.tgz.
Revision 1.63 / (download) - annotate - [select for diffs], Sat Aug 30 14:44:20 2014 UTC (9 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.62: +3 -3 lines
Diff to previous 1.62 (colored)
Indent.
Revision 1.62 / (download) - annotate - [select for diffs], Fri Aug 29 06:03:34 2014 UTC (9 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.61: +1 -2 lines
Diff to previous 1.61 (colored)
knock out double .Pp;
Revision 1.61 / (download) - annotate - [select for diffs], Thu Aug 28 22:09:00 2014 UTC (9 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.60: +8 -9 lines
Diff to previous 1.60 (colored)
Merge a paragraph.
Revision 1.60 / (download) - annotate - [select for diffs], Thu Aug 28 20:55:28 2014 UTC (9 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.59: +4 -4 lines
Diff to previous 1.59 (colored)
tweak AUTHORS; ok ajacoutot
Revision 1.59 / (download) - annotate - [select for diffs], Thu Aug 28 17:43:21 2014 UTC (9 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.58: +33 -82 lines
Diff to previous 1.58 (colored)
Major sysmerge cleanup now that both etc and xetc sets are part of base. 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.
Revision 1.58 / (download) - annotate - [select for diffs], Tue Aug 26 21:29:56 2014 UTC (9 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.57: +22 -40 lines
Diff to previous 1.57 (colored)
Fist shot at fixing sysmerge(8) with etc-in-base; note that it's still in transition state and the utility will get a lot of revamping in the near future.
Revision 1.57 / (download) - annotate - [select for diffs], Mon Aug 11 09:03:27 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
Changes since 1.56: +4 -6 lines
Diff to previous 1.56 (colored)
Steal stripcom() from /etc/rc to parse sysmerge.ignore.
Revision 1.56 / (download) - annotate - [select for diffs], Mon Aug 11 06:30:39 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
Changes since 1.55: +6 -9 lines
Diff to previous 1.55 (colored)
Move a sentence to the corresponding option description. from jmc@
Revision 1.55 / (download) - annotate - [select for diffs], Sun Aug 10 17:15:18 2014 UTC (9 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.54: +3 -4 lines
Diff to previous 1.54 (colored)
- add -p to SYNOPSIS - the argument to -s is not optional ok ajacoutot
Revision 1.54 / (download) - annotate - [select for diffs], Sat Aug 9 16:39:25 2014 UTC (9 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.53: +5 -7 lines
Diff to previous 1.53 (colored)
less chatty; ok ajacoutot
Revision 1.53 / (download) - annotate - [select for diffs], Sat Aug 9 12:45:03 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
Changes since 1.52: +16 -2 lines
Diff to previous 1.52 (colored)
Initial support for handling configuration files from packages (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
Revision 1.52 / (download) - annotate - [select for diffs], Sat Aug 9 12:34:05 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
Changes since 1.51: +3 -2 lines
Diff to previous 1.51 (colored)
sysctl.conf is an example. Tweak error output. Mention that `-S' has no effect when sets aren't used.
Revision 1.51 / (download) - annotate - [select for diffs], Fri Aug 8 17:04:55 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
Changes since 1.50: +6 -17 lines
Diff to previous 1.50 (colored)
Drop some useless verbiage. sysctl.conf is an example now.
Revision 1.50 / (download) - annotate - [select for diffs], Tue Jul 15 09:27:04 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6
Changes since 1.49: +6 -6 lines
Diff to previous 1.49 (colored)
/var/db/sysmerge -> /usr/share/sysmerge ok deraadt@
Revision 1.49 / (download) - annotate - [select for diffs], Sun Jul 13 07:12:41 2014 UTC (9 years, 11 months ago) by ajacoutot
Branch: MAIN
Changes since 1.48: +2 -1 lines
Diff to previous 1.48 (colored)
Also ignore examplessum.
Revision 1.48 / (download) - annotate - [select for diffs], Sat Jul 12 16:26:35 2014 UTC (9 years, 11 months ago) by ajacoutot
Branch: MAIN
Changes since 1.47: +6 -4 lines
Diff to previous 1.47 (colored)
Extend output a bit.
Revision 1.47 / (download) - annotate - [select for diffs], Sat Jul 12 15:31:54 2014 UTC (9 years, 11 months ago) by ajacoutot
Branch: MAIN
Changes since 1.46: +8 -2 lines
Diff to previous 1.46 (colored)
Initial support for /etc/examples.
Revision 1.46 / (download) - annotate - [select for diffs], Thu Jul 10 11:00:03 2014 UTC (9 years, 11 months ago) by ajacoutot
Branch: MAIN
Changes since 1.45: +2 -3 lines
Diff to previous 1.45 (colored)
/var/games/tetris.scores will move away from the etc set.
Revision 1.45 / (download) - annotate - [select for diffs], Wed Mar 26 23:03:59 2014 UTC (10 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.44: +1 -2 lines
Diff to previous 1.44 (colored)
login.conf(5) is not special anymore.
Revision 1.44 / (download) - annotate - [select for diffs], Tue Jan 28 09:42:42 2014 UTC (10 years, 4 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.43: +3 -3 lines
Diff to previous 1.43 (colored)
Drop comma (sthen@).
Revision 1.43 / (download) - annotate - [select for diffs], Tue Jan 28 09:25:22 2014 UTC (10 years, 4 months ago) by ajacoutot
Branch: MAIN
Changes since 1.42: +12 -24 lines
Diff to previous 1.42 (colored)
Drop FETCH_CMD and always use ftp(1). New fetch() function that wraps ftp(1) with our needed knobs (courtesy of halex@) input from halex@ rpe@ ok halex@
Revision 1.42 / (download) - annotate - [select for diffs], Mon Jan 27 17:05:37 2014 UTC (10 years, 4 months ago) by ajacoutot
Branch: MAIN
Changes since 1.41: +4 -4 lines
Diff to previous 1.41 (colored)
Make it clear SM_PATH will fetch the sets corresponding to the currently running release.
Revision 1.41 / (download) - annotate - [select for diffs], Tue Jan 21 19:03:44 2014 UTC (10 years, 4 months ago) by ajacoutot
Branch: MAIN
Changes since 1.40: +12 -4 lines
Diff to previous 1.40 (colored)
Document -S and the new signify(1) use by sysmerge(8). input and ok jmc@
Revision 1.40 / (download) - annotate - [select for diffs], Tue Sep 10 08:44:38 2013 UTC (10 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.39: +14 -5 lines
Diff to previous 1.39 (colored)
Add support for the SM_PATH environment variable. This changes the 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@
Revision 1.39 / (download) - annotate - [select for diffs], Tue Jul 16 11:13:34 2013 UTC (10 years, 10 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4
Changes since 1.38: +4 -4 lines
Diff to previous 1.38 (colored)
use .Mt for email addresses; from Jan Stary <hans at stare dot cz>; ok jmc@
Revision 1.38 / (download) - annotate - [select for diffs], Tue Aug 28 05:42:07 2012 UTC (11 years, 9 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE,
OPENBSD_5_3
Changes since 1.37: +5 -3 lines
Diff to previous 1.37 (colored)
Always compare master.passwd(5) and group(5) regardless of their sums: this is a sanity check to ensure no system user(s)/group(s) are missing. ok sthen@
Revision 1.37 / (download) - annotate - [select for diffs], Wed Aug 15 19:25:41 2012 UTC (11 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.36: +4 -4 lines
Diff to previous 1.36 (colored)
use Lk for links;
Revision 1.36 / (download) - annotate - [select for diffs], Fri Feb 17 14:06:42 2012 UTC (12 years, 3 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE,
OPENBSD_5_2
Changes since 1.35: +2 -8 lines
Diff to previous 1.35 (colored)
Remove the backup chunk from the man page. People should use backup anyway and sysmerge(8) automatically save replaced files. ok sthen@
Revision 1.35 / (download) - annotate - [select for diffs], Thu Jul 21 12:31:51 2011 UTC (12 years, 10 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0
Changes since 1.34: +4 -4 lines
Diff to previous 1.34 (colored)
Adjust work directory name.
Revision 1.34 / (download) - annotate - [select for diffs], Thu Nov 11 12:51:31 2010 UTC (13 years, 7 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE,
OPENBSD_4_9
Changes since 1.33: +3 -3 lines
Diff to previous 1.33 (colored)
Missed that part in previous. from jmc@
Revision 1.33 / (download) - annotate - [select for diffs], Thu Nov 11 10:46:10 2010 UTC (13 years, 7 months ago) by ajacoutot
Branch: MAIN
Changes since 1.32: +3 -3 lines
Diff to previous 1.32 (colored)
Unconfuse usage. prodded by and ok espie@, ok jmc@
Revision 1.32 / (download) - annotate - [select for diffs], Mon Jul 5 08:30:28 2010 UTC (13 years, 11 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE,
OPENBSD_4_8
Changes since 1.31: +10 -2 lines
Diff to previous 1.31 (colored)
Automatically install missing users and groups. (does *NOT* touch existing users/groups) "I like it" from several... inputs from sthen@ and halex@ ok krw@ halex@ sthen@
Revision 1.31 / (download) - annotate - [select for diffs], Sat Mar 20 09:45:11 2010 UTC (14 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.30: +3 -3 lines
Diff to previous 1.30 (colored)
s/sh/ksh/
Revision 1.30 / (download) - annotate - [select for diffs], Fri Dec 18 13:51:02 2009 UTC (14 years, 5 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.29: +4 -2 lines
Diff to previous 1.29 (colored)
Add etcsum and xetcsum to IGNORE_FILES. Needed for upcoming change. ok sthen@
Revision 1.29 / (download) - annotate - [select for diffs], Sun Dec 6 16:21:36 2009 UTC (14 years, 6 months ago) by ajacoutot
Branch: MAIN
Changes since 1.28: +4 -2 lines
Diff to previous 1.28 (colored)
Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES. ok sthen@
Revision 1.28 / (download) - annotate - [select for diffs], Sun Aug 23 20:06:32 2009 UTC (14 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.27: +14 -2 lines
Diff to previous 1.27 (colored)
Document all variables used by sysmerge. "fine" jmc@
Revision 1.27 / (download) - annotate - [select for diffs], Tue Aug 18 08:27:32 2009 UTC (14 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.26: +19 -13 lines
Diff to previous 1.26 (colored)
HEADS-UP: change the way sysmerge(8) runs by default. 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++ :)"
Revision 1.26 / (download) - annotate - [select for diffs], Fri Jun 5 06:27:52 2009 UTC (15 years ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6
Changes since 1.25: +3 -3 lines
Diff to previous 1.25 (colored)
tweak previous;
Revision 1.25 / (download) - annotate - [select for diffs], Thu Jun 4 23:24:17 2009 UTC (15 years ago) by ajacoutot
Branch: MAIN
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)
When in auto-mode, automatically install binary files (from the X set). ``please put it in'', pyr@
Revision 1.24 / (download) - annotate - [select for diffs], Tue May 12 20:58:15 2009 UTC (15 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.23: +13 -16 lines
Diff to previous 1.23 (colored)
simplify the descriptions of -a and -b; this has taken me and antoine an entire day of mailing to make this tweak ;( ok ajacoutot
Revision 1.23 / (download) - annotate - [select for diffs], Tue May 12 13:04:18 2009 UTC (15 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.22: +3 -3 lines
Diff to previous 1.22 (colored)
- tweak the description of -a - remove -SX from usage() ok ajacoutot
Revision 1.22 / (download) - annotate - [select for diffs], Mon May 11 20:25:55 2009 UTC (15 years, 1 month ago) by ajacoutot
Branch: MAIN
Changes since 1.21: +10 -31 lines
Diff to previous 1.21 (colored)
This commit adds a new feature to sysmerge(8), usable in '-a' mode.
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@
Revision 1.21 / (download) - annotate - [select for diffs], Sun Apr 12 07:43:17 2009 UTC (15 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.20: +41 -61 lines
Diff to previous 1.20 (colored)
When in automode, sysmerge will now automatically install files 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@
Revision 1.20 / (download) - annotate - [select for diffs], Thu Apr 9 14:43:54 2009 UTC (15 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)
Sort. requested by jmc@
Revision 1.19 / (download) - annotate - [select for diffs], Thu Apr 9 10:44:50 2009 UTC (15 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.18: +2 -1 lines
Diff to previous 1.18 (colored)
Add a hook to deal with special sendmail db files under /etc/mail/ Tweak some outputs and put interesting messages into sysmerge.log. export the NEED_NEWALIASES variable. inputs from and ok sthen@
Revision 1.18 / (download) - annotate - [select for diffs], Mon Apr 6 14:39:23 2009 UTC (15 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.17: +4 -4 lines
Diff to previous 1.17 (colored)
new sentence, new line;
Revision 1.17 / (download) - annotate - [select for diffs], Mon Apr 6 10:35:20 2009 UTC (15 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.16: +13 -4 lines
Diff to previous 1.16 (colored)
Add a report summary file, ${WRKDIR}/sysmerge.log, that will include all
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@
Revision 1.16 / (download) - annotate - [select for diffs], Wed Mar 25 18:02:12 2009 UTC (15 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.15: +7 -7 lines
Diff to previous 1.15 (colored)
Several cleanups: * 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@
Revision 1.15 / (download) - annotate - [select for diffs], Wed Mar 25 13:20:02 2009 UTC (15 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.14: +37 -2 lines
Diff to previous 1.14 (colored)
You can now feed sysmerge with an etcXX and/or xetcXX tarball(s) 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@
Revision 1.14 / (download) - annotate - [select for diffs], Tue Feb 17 16:48:11 2009 UTC (15 years, 3 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE,
OPENBSD_4_5
Changes since 1.13: +6 -12 lines
Diff to previous 1.13 (colored)
- always run pwd_mdb, newaliases, MAKEDEV and cap_mkdb even when not in 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@
Revision 1.13 / (download) - annotate - [select for diffs], Wed Dec 17 09:17:47 2008 UTC (15 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.12: +21 -5 lines
Diff to previous 1.12 (colored)
more on editors; ok ajacoutot
Revision 1.12 / (download) - annotate - [select for diffs], Tue Dec 16 22:23:55 2008 UTC (15 years, 5 months ago) by ajacoutot
Branch: MAIN
Changes since 1.11: +4 -3 lines
Diff to previous 1.11 (colored)
- make it possible to edit a merged file using an external editor ; useful when 'sdiff eb' does not cope with one's needs. idea and input from weerd@ ok weerd@ sthen@
Revision 1.11 / (download) - annotate - [select for diffs], Fri Sep 12 13:31:59 2008 UTC (15 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.10: +10 -3 lines
Diff to previous 1.10 (colored)
- make it possible to use a user defined MERGE_CMD instead of sdiff mostly from andreas@ man page enhancing by jmc@ ok andreas@
Revision 1.10 / (download) - annotate - [select for diffs], Fri Jul 4 15:03:45 2008 UTC (15 years, 11 months ago) by sthen
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE,
OPENBSD_4_4
Changes since 1.9: +10 -5 lines
Diff to previous 1.9 (colored)
Teach sysmerge to retrieve {etc,xetc}*.tgz files from FTP/HTTP
paths using ftp(1). Thanks ajacoutot and jmc for suggestions.
ok ajacoutot jmc, no objection deraadt
Revision 1.9 / (download) - annotate - [select for diffs], Fri Jul 4 10:23:56 2008 UTC (15 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.8: +11 -8 lines
Diff to previous 1.8 (colored)
some small text improvements; ok ajacoutot
Revision 1.8 / (download) - annotate - [select for diffs], Fri Jun 13 00:46:57 2008 UTC (16 years ago) by ajacoutot
Branch: MAIN
Changes since 1.7: +8 -2 lines
Diff to previous 1.7 (colored)
- add support for ignoring files and directories from comparison 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@
Revision 1.7 / (download) - annotate - [select for diffs], Fri Jun 13 00:33:04 2008 UTC (16 years ago) by ajacoutot
Branch: MAIN
Changes since 1.6: +12 -2 lines
Diff to previous 1.6 (colored)
- always force full file check on fbtab, login.conf, sysctl.conf and 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@
Revision 1.6 / (download) - annotate - [select for diffs], Mon Jun 9 23:11:01 2008 UTC (16 years ago) by ajacoutot
Branch: MAIN
Changes since 1.5: +8 -2 lines
Diff to previous 1.5 (colored)
- encourage people to use the same source as was used to upgrade system binaries so that some etc files don't get forgotten in the process discussed with kurt@ tweaks and ok jmc@
Revision 1.5 / (download) - annotate - [select for diffs], Sun Jun 1 15:07:00 2008 UTC (16 years ago) by ajacoutot
Branch: MAIN
Changes since 1.4: +10 -4 lines
Diff to previous 1.4 (colored)
- make it possible to merge files from xetcXX only man page bits by jmc@ suggested by an ok jdixon@ merdely@
Revision 1.4 / (download) - annotate - [select for diffs], Wed May 14 07:48:35 2008 UTC (16 years, 1 month ago) by ajacoutot
Branch: MAIN
Changes since 1.3: +9 -3 lines
Diff to previous 1.3 (colored)
- add a non-interactive mode to sysmerge ('-b')
- yesno is only used once
man page consulting jmc@ ;)
ok laurent@ pyr@
Revision 1.3 / (download) - annotate - [select for diffs], Wed Apr 30 20:15:54 2008 UTC (16 years, 1 month ago) by ajacoutot
Branch: MAIN
Changes since 1.2: +10 -3 lines
Diff to previous 1.2 (colored)
* add xetcXX.tgz support to sysmerge and handle binary files * 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@
Revision 1.2 / (download) - annotate - [select for diffs], Thu Apr 24 17:51:41 2008 UTC (16 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.1: +3 -3 lines
Diff to previous 1.1 (colored)
kill first person
Revision 1.1 / (download) - annotate - [select for diffs], Tue Apr 22 20:53:16 2008 UTC (16 years, 1 month ago) by ajacoutot
Branch: MAIN
Welcome sysmerge(8), a mergemaster-based utility to help you update 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@