#
fa9896e0 |
|
16-Aug-2023 |
Warner Losh <imp@FreeBSD.org> |
Remove $FreeBSD$: two-line nroff pattern Remove /^\.\\"\n\.\\"\s*\$FreeBSD\$$\n/
|
#
febca0e6 |
|
09-Aug-2022 |
Jessica Clarke <jrtc27@FreeBSD.org> |
etcupdate: Add a -N flag to perform a NO_ROOT build This is in preparation for including an etcupdate tree when performing a -DNO_ROOT release image build. Although -DNO_ROOT can be passed via -M, to be useful we need to mangle the resulting METALOG to mirror the various cleanups to the tree that are done after the build (removing generated files, empty files and empty directories), so etcupdate needs its own flag. Reviewed by: jhb, pauamma Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35857
|
#
5513d7de |
|
09-Aug-2022 |
Jessica Clarke <jrtc27@FreeBSD.org> |
etcupdate: Add a -m flag to change the make binary that's run This will allow release/Makefile to forward on ${MAKE} to allow building on non-FreeBSD systems where ${MAKE} is something other than make, as make is typically GNU make in such situations. Reviewed by: jhb, pauamma Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35854
|
#
5eb9c93a |
|
26-Apr-2021 |
John Baldwin <jhb@FreeBSD.org> |
etcupdate: Add -D destdir to usage for 'extract'. Reported by: Mark Millard <marklmi@yahoo.com> MFC after: 1 week
|
#
ba30215a |
|
20-Apr-2021 |
John Baldwin <jhb@FreeBSD.org> |
etcupdate: Add a revert mode to restore one or more stock files. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D29846
|
#
e36f62bd |
|
27-Nov-2018 |
Mateusz Piotrowski <0mp@FreeBSD.org> |
Cross-reference mergemaster(8) & etcupdate(8). Suggested by: Daniel Ebdrup Reviewed by: bcr Approved by: bcr (doc), krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D18350
|
#
7bb0da8d |
|
26-Apr-2016 |
Bjoern Heidotting <bhd@FreeBSD.org> |
Remove redundant word. Reviewed by: bjk, bcr Differential Revision: https://reviews.freebsd.org/D6064
|
#
3c9ac704 |
|
29-Feb-2016 |
Edward Tomasz Napierala <trasz@FreeBSD.org> |
tzsetup(1) -> tzsetup(8) MFC after: 1 month Sponsored by: The FreeBSD Foundation
|
#
74914641 |
|
29-Sep-2015 |
Bryan Drewery <bdrewery@FreeBSD.org> |
Document the post-merge actions of calling tzsetup(8) and services_mkdb(8) added in r259134. MFC after: 3 days
|
#
179fa75e |
|
23-Apr-2015 |
John Baldwin <jhb@FreeBSD.org> |
Reassign copyright statements on several files from Advanced Computing Technologies LLC to Hudson River Trading LLC. Approved by: Hudson River Trading LLC (who owns ACT LLC) MFC after: 1 week
|
#
079e563c |
|
29-Oct-2014 |
John Baldwin <jhb@FreeBSD.org> |
Rework the EXAMPLES section to be a bit clearer. - 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
|
#
01c2b8ac |
|
20-Jun-2014 |
Baptiste Daroussin <bapt@FreeBSD.org> |
use .Mt to mark up email addresses consistently (part2) PR: 191174 Submitted by: Franco Fichtner <franco@lastsummer.de>
|
#
3e920822 |
|
09-Dec-2013 |
John Baldwin <jhb@FreeBSD.org> |
- Refresh /etc/localtime after each update using tzsetup -r. - Regenerate /var/db/services.db when /etc/services changes. MFC after: 1 week
|
#
21d1f635 |
|
12-Nov-2013 |
John Baldwin <jhb@FreeBSD.org> |
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
|
#
37956492 |
|
12-Nov-2013 |
John Baldwin <jhb@FreeBSD.org> |
Sort option flags and fix the width of the options list. This is a purely mechanical change, no content changes.
|
#
cc59cb76 |
|
13-Jul-2012 |
Joel Dahl <joel@FreeBSD.org> |
Add HISTORY section.
|
#
9efc0059 |
|
13-Jul-2012 |
Joel Dahl <joel@FreeBSD.org> |
Minor mdoc, spelling and end of line whitespace fixes.
|
#
6f9cd2a9 |
|
13-Jul-2012 |
John Baldwin <jhb@FreeBSD.org> |
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)
|