summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
AgeCommit message (Expand)Author
2010-03-20s/sh/ksh/Antoine Jacoutot
2010-02-06Remove newly generated sum file(s) if it did not exist before and trapAntoine Jacoutot
2010-01-13- move the separator so it's just displayed for files with diffs toStuart Henderson
2009-12-18xargs takes the whole list as argument, so no need to append.Antoine Jacoutot
2009-12-18Add etcsum and xetcsum to IGNORE_FILES. Needed for upcoming change.Antoine Jacoutot
2009-12-06Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES.Antoine Jacoutot
2009-10-02Use BSD.x11.dist mtree file now that it is up-to-date and maintained.Antoine Jacoutot
2009-08-24Harden variables setting, prodded by alex@Antoine Jacoutot
2009-08-23Document all variables used by sysmerge.Antoine Jacoutot
2009-08-18HEADS-UP: change the way sysmerge(8) runs by default.Antoine Jacoutot
2009-08-17Don't try to move files that don't exist.Antoine Jacoutot
2009-08-16Properly initialize the array setting auto-upgradable files.Antoine Jacoutot
2009-06-28Fix small regression introduced with symlinks handling.Antoine Jacoutot
2009-06-28Remove useless blank space in output.Antoine Jacoutot
2009-06-28Teach sysmerge to deal with links (found the hard way when I realised IAntoine Jacoutot
2009-06-14DBDIR resides in DESTDIR.Antoine Jacoutot
2009-06-05tweak previous;Jason McIntyre
2009-06-04When in auto-mode, automatically install binary files (from the X set).Antoine Jacoutot
2009-05-13Remove unused args from getopts.Antoine Jacoutot
2009-05-12simplify the descriptions of -a and -b; this has taken me and antoineJason McIntyre
2009-05-12- tweak the description of -aJason McIntyre
2009-05-11This commit adds a new feature to sysmerge(8), usable in '-a' mode.Antoine Jacoutot
2009-04-28Add the possibility to go back from merging mode to the previous menu.Antoine Jacoutot
2009-04-12Better output (i.e. /etc instead of //etc)Antoine Jacoutot
2009-04-12Treat /etc/hosts the same way as /etc/group and /etc/master.passwd: makeAntoine Jacoutot
2009-04-12When in automode, sysmerge will now automatically install filesAntoine Jacoutot
2009-04-09Sort.Antoine Jacoutot
2009-04-09Add a hook to deal with special sendmail db files under /etc/mail/Antoine Jacoutot
2009-04-06Fix regression introduced in r1.32 where after running MAKEDEV sysmergeAntoine Jacoutot
2009-04-06new sentence, new line;Jason McIntyre
2009-04-06Add a report summary file, ${WRKDIR}/sysmerge.log, that will include allAntoine Jacoutot
2009-03-27Mitigate the risk of leaving the system in an inconsistent stateAntoine Jacoutot
2009-03-25Several cleanups:Antoine Jacoutot
2009-03-25You can now feed sysmerge with an etcXX and/or xetcXX tarball(s)Antoine Jacoutot
2009-02-17- always run pwd_mdb, newaliases, MAKEDEV and cap_mkdb even when not inAntoine Jacoutot
2009-02-17- better outputAntoine Jacoutot
2008-12-17more on editors; ok ajacoutotJason McIntyre
2008-12-16- make it possible to edit a merged file using an external editor ;Antoine Jacoutot
2008-12-15Cleanup the temporary directory in all the error paths.Federico G. Schwindt
2008-09-17- when merging a file, add a key to see a diff between the merged fileAntoine Jacoutot
2008-09-12- make it possible to use a user defined MERGE_CMD instead of sdiffAntoine Jacoutot
2008-09-12- use shell built-in getopts instead of getopt(1)Antoine Jacoutot
2008-09-06- don't list *.merged files in the "remaining for you to merge by hand"Antoine Jacoutot
2008-09-02- make sure they are no sendmail leftovers in src when sysmerge stopsAntoine Jacoutot
2008-08-29- prevent sysmerge from installing a virgin master.passwd and groupAntoine Jacoutot
2008-07-21Leave PATH alone.Antoine Jacoutot
2008-07-10Fix "etc source" output when not using a tarballAntoine Jacoutot
2008-07-08Typo in summarize output.Antoine Jacoutot
2008-07-04Teach sysmerge to retrieve {etc,xetc}*.tgz files from FTP/HTTPStuart Henderson
2008-07-04some small text improvements; ok ajacoutotJason McIntyre