summaryrefslogtreecommitdiffstats
path: root/usr.sbin/etcupdate
Commit message (Collapse)AuthorAgeFilesLines
* Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) andngie2015-10-121-2/+0
| | | | | | | | | | | | netbsd-tests.test.mk (r289151) - Eliminate explicit OBJTOP/SRCTOP setting - Convert all ad hoc NetBSD test integration over to netbsd-tests.test.mk - Remove unnecessary TESTSDIR setting - Use SRCTOP where possible for clarity MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Divison
* Document the post-merge actions of calling tzsetup(8) and services_mkdb(8)bdrewery2015-09-291-2/+14
| | | | | | added in r259134. MFC after: 3 days
* Add META_MODE support.sjg2015-06-131-0/+11
|\ | | | | | | | | | | | | | | | | | | | | Off by default, build behaves normally. WITH_META_MODE we get auto objdir creation, the ability to start build from anywhere in the tree. Still need to add real targets under targets/ to build packages. Differential Revision: D2796 Reviewed by: brooks imp
| * dirdeps.mk now sets DEP_RELDIRsjg2015-06-081-2/+0
| |
| * Merge sync of headsjg2015-05-279-9/+9
| |\ | |/ |/|
| * Merge from head@274682sjg2014-11-191-6/+58
| |\
| * \ Merge head from 7/28sjg2014-08-191-1/+1
| |\ \
| * \ \ Merge from headsjg2014-05-081-1/+1
| |\ \ \
| * \ \ \ Merge headsjg2014-04-2811-54/+3350
| |\ \ \ \
| * | | | | Updated dependenciessjg2013-02-161-2/+0
| | | | | |
| * | | | | Updated/new Makefile.dependsjg2012-11-081-0/+14
| | | | | |
* | | | | | Reassign copyright statements on several files from Advancedjhb2015-04-239-9/+9
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Computing Technologies LLC to Hudson River Trading LLC. Approved by: Hudson River Trading LLC (who owns ACT LLC) MFC after: 1 week
* | | | | Rework the EXAMPLES section to be a bit clearer.jhb2014-10-291-6/+58
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an example of using etcupdate diff. - Create a subsection on bootstrapping that is below the simple examples. This should make it clearer that 'etcupdate extract' is a one-time operation and not part of the common workflow. It also adds more suggestions on when bootstrapping is needed and additional steps to make future merges simpler. Reviewed by: adrian MFC after: 3 days
* | | | use .Mt to mark up email addresses consistently (part2)bapt2014-06-201-1/+1
| |_|/ |/| | | | | | | | | | | PR: 191174 Submitted by: Franco Fichtner <franco@lastsummer.de>
* | | Use src.opts.mk in preference to bsd.own.mk except where we need stuffimp2014-05-061-1/+1
| |/ |/| | | | | from the latter.
* | Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout.jmmv2014-03-169-0/+3129
| | | | | | | | | | | | | | | | | | | | | | This change was originally going to only migrate the usr.sbin tests but, as it turns out, the usr.sbin/sa/ tests require files from usr.bin/lastcomm/ so it's better to just also migrate the latter at the same time. The other usr.bin tests will be moved separately. To make these tests work within the test suite, some of them have required changes to prevent modifying the source directory and instead just rely on the current directory for file manipulation.
* | Generate /var/db/services.db during 'make distribution' so that it isjhb2014-01-221-1/+2
| | | | | | | | | | | | | | | | present during new installs. Update etcupdate and mergemaster to ignore the generated file. Tested by: gjb (release build) MFC after: 1 month
* | - Refresh /etc/localtime after each update using tzsetup -r.jhb2013-12-092-3/+66
| | | | | | | | | | | | - Regenerate /var/db/services.db when /etc/services changes. MFC after: 1 week
* | Fix a couple of issues with -F:jhb2013-11-151-10/+18
| | | | | | | | | | | | | | | | | | - Fix ALWAYS_INSTALL to take precedence over the FreeBSD ID checks. In particular, always install a file where the only change was the FreeBSD ID even if -F is specified. - Fix the -F option in the case that the only upstream change is a change in the FreeBSD ID and the local file is removed. - Add tests for these two cases.
* | Escape a newline added in the previous commit when verifying the flagsjhb2013-11-131-1/+1
| | | | | | | | passed to the build, diff, or status commands.
* | Add a pre-world mode of updating similar to the -p option that can bejhb2013-11-122-20/+115
| | | | | | | | | | | | | | | | | | | | passed to mergemaster. In this mode, only changes to /etc/master.passwd and /etc/group are merged to /etc. In addition, it uses a temporary tree to stage these changes rather than overwriting the existing 'current' and 'previous' trees so that a full update can be run after a normal installworld has completed. MFC after: 2 weeks
* | Sort option flags and fix the width of the options list. This is a purelyjhb2013-11-121-21/+21
|/ | | | mechanical change, no content changes.
* Add HISTORY section.joel2012-07-131-0/+5
|
* Minor mdoc, spelling and end of line whitespace fixes.joel2012-07-131-6/+6
|
* The etcupdate utility is a tool for managing updates to files that arejhb2012-07-133-0/+2465
not updated as part of `make installworld' such as files in /etc. It manages updates by doing a three-way merge of changes made to these files against the local versions. It is also designed to minimize the amount of user intervention with the goal of simplifying upgrades for clusters of machines. The primary difference from mergemaster is that etcupdate requires less manual work. The primary difference from etcmerge is that etcupdate updates files in-place similar to mergemaster rather than building a separate /etc tree. Requested by: obrien, kib, theraven, joeld (among others)
OpenPOWER on IntegriCloud