summaryrefslogtreecommitdiffstats
path: root/usr.sbin/Makefile
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2012-07-13 13:23:48 +0000
committerjhb <jhb@FreeBSD.org>2012-07-13 13:23:48 +0000
commit2b8d56f3cffc7d6d5e967273ea2edea9c19d44ac (patch)
treef39420ab6a09347ad5f2d8be16e0eabccb018bf6 /usr.sbin/Makefile
parent98fa6a1cdbda0168d4fbbf91839fd17b4f842873 (diff)
downloadFreeBSD-src-2b8d56f3cffc7d6d5e967273ea2edea9c19d44ac.zip
FreeBSD-src-2b8d56f3cffc7d6d5e967273ea2edea9c19d44ac.tar.gz
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)
Diffstat (limited to 'usr.sbin/Makefile')
-rw-r--r--usr.sbin/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index c16821f..7df7e7d 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -23,6 +23,7 @@ SUBDIR= adduser \
digictl \
diskinfo \
dumpcis \
+ etcupdate \
extattr \
extattrctl \
fifolog \
OpenPOWER on IntegriCloud