Searched hist:"6 f9cd2a9dc84b8309f19939ccfb1ada88ca07905" (Results 1 – 4 of 4) sorted by relevance
/freebsd/usr.sbin/etcupdate/ |
H A D | Makefile | 6f9cd2a9dc84b8309f19939ccfb1ada88ca07905 Fri Jul 13 15:23:48 CEST 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)
|
H A D | etcupdate.8 | 6f9cd2a9dc84b8309f19939ccfb1ada88ca07905 Fri Jul 13 15:23:48 CEST 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)
|
H A D | etcupdate.sh | 6f9cd2a9dc84b8309f19939ccfb1ada88ca07905 Fri Jul 13 15:23:48 CEST 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)
|
/freebsd/usr.sbin/ |
H A D | Makefile | diff 6f9cd2a9dc84b8309f19939ccfb1ada88ca07905 Fri Jul 13 15:23:48 CEST 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)
|