d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
278,672 Commits 72 Branches 135 Tags 3.2 GiB
34aac98e35
Commit Graph

61 Commits

Author SHA1 Message Date
John Baldwin
385d6d4738 Generate /var/db/services.db during 'make distribution' so that it is 
present during new installs.  Update etcupdate and mergemaster to
ignore the generated file.

Tested by:	gjb (release build)
MFC after:	1 month
 2014-01-22 16:59:53 +00:00
John Baldwin
3e920822b7 - Refresh /etc/localtime after each update using tzsetup -r. 
- Regenerate /var/db/services.db when /etc/services changes.

MFC after:	1 week
 2013-12-09 19:31:30 +00:00
John Baldwin
8cc81f38e9 Fix a couple of issues with -F: 
- 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.
 2013-11-15 20:01:07 +00:00
John Baldwin
11a90beea4 Escape a newline added in the previous commit when verifying the flags 
passed to the build, diff, or status commands.
 2013-11-13 16:50:19 +00:00
John Baldwin
21d1f635ee Add a pre-world mode of updating similar to the -p option that can be 
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
 2013-11-12 19:44:18 +00:00
John Baldwin
3795649286 Sort option flags and fix the width of the options list. This is a purely 
mechanical change, no content changes.
 2013-11-12 19:18:00 +00:00
Simon J. Gerraty
f5f7c05209 Updated dependencies 2013-02-16 01:23:54 +00:00
Simon J. Gerraty
7cd2dcf076 Updated/new Makefile.depend 2012-11-08 21:24:17 +00:00
Joel Dahl
cc59cb7622 Add HISTORY section. 2012-07-13 21:27:18 +00:00
Joel Dahl
9efc00598b Minor mdoc, spelling and end of line whitespace fixes. 2012-07-13 15:25:10 +00:00
John Baldwin
6f9cd2a9dc The etcupdate utility is a tool for managing updates to files that are 
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)
 2012-07-13 13:23:48 +00:00