1 .\" Copyright (c) 2010-2013 Hudson River Trading LLC
2 .\" Written by: John H. Baldwin <jhb@FreeBSD.org>
3 .\" All rights reserved.
5 .\" Redistribution and use in source and binary forms, with or without
6 .\" modification, are permitted provided that the following conditions
8 .\" 1. Redistributions of source code must retain the above copyright
9 .\" notice, this list of conditions and the following disclaimer.
10 .\" 2. Redistributions in binary form must reproduce the above copyright
11 .\" notice, this list of conditions and the following disclaimer in the
12 .\" documentation and/or other materials provided with the distribution.
14 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
15 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
17 .\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
18 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 .Nd "manage updates to system files not updated by installworld"
36 .Op Fl r | Fl s Ar source | Fl t Ar tarball
62 .Op Fl s Ar source | Fl t Ar tarball
86 utility is a tool for managing updates to files that are not updated as
91 It manages updates by doing a three-way merge of changes made to these
92 files against the local versions.
93 It is also designed to minimize the amount of user intervention with
94 the goal of simplifying upgrades for clusters of machines.
96 To perform a three-way merge,
98 keeps copies of the current and previous versions of files that it manages.
99 These copies are stored in two trees known as the
110 copies of each file to determine which changes need to be merged into the
111 local version of each file.
112 If a file can be updated without generating a conflict,
114 will update the file automatically.
115 If the local changes to a file conflict with the changes made to a file in
117 then a merge conflict is generated.
118 The conflict must be resolved after the merge has finished.
121 utility will not perform a new merge until all conflicts from an earlier
126 utility supports several modes of operation.
127 The mode is specified via an optional command argument.
128 If present, the command must be the first argument on the command line.
129 If a command is not specified, the default mode is used.
131 The default mode merges changes from the source tree to the destination
140 it compares the two trees merging changes into the destination directory.
142 it displays warnings for any conditions it could not handle automatically.
146 option is not specified,
147 then the first step taken is to update the
155 then that tree is saved as the
160 tree is removed if it exists.
163 tree is built from a source tree.
165 if a tarball is specified via the
168 then the tree is extracted from that tarball instead.
172 compares the files in the
177 If a file was removed from the
180 then it will be removed from the destination directory only if it
181 does not have any local modifications.
182 If a file was added to the
185 then it will be copied to the destination directory only if it
186 would not clobber an existing file.
187 If a file is changed in the
192 will attempt to merge the changes into the version of the file in the
193 destination directory.
194 If the merge encounters conflicts,
195 then a version of the file with conflict markers will be saved for
197 If the merge does not encounter conflicts,
198 then the merged version of the file will be saved in the destination
202 is not able to safely merge in changes to a file other than a merge conflict,
203 it will generate a warning.
205 For each file that is updated a line will be output with a leading character
206 to indicate the action taken.
207 The possible actions follow:
209 .Bl -tag -width "A" -compact -offset indent
223 if any warnings were encountered they are displayed after the merge has
226 Note that for certain files
228 will perform post-install actions any time that the file is updated.
232 .Pa /etc/master.passwd
236 .Pa /etc/login.conf.db
242 .Pa /etc/mail/aliases
259 One exception is that if
260 .Pa /etc/mail/aliases
261 is changed and the destination directory is not the default,
262 then a warning will be issued instead.
263 This is due to a limitation of the
269 is changed and the destination directory is not the default,
272 will not be executed due to a limitation of that script.
273 In this case no warning is issued as the result of
275 is merely cosmetic and will be corrected on the next reboot.
279 mode is used to build a tarball that contains a snapshot of a
282 This tarball can be used by the default and extract modes.
283 Using a tarball can allow
285 to perform a merge without requiring a source tree that matches the
286 currently installed world.
289 argument specifies the name of the file to create.
297 mode compares the versions of files in the destination directory to the
299 tree and generates a unified format diff of the changes.
300 This can be used to determine which files have been locally modified and how.
303 does not manage files that are not maintained in the source tree such as
313 Unlike the default mode,
314 it does not save any existing
316 tree and does not modify any existing
321 tree can either be built from a source tree or extracted from a tarball.
325 mode is used to resolve any conflicts encountered during a merge.
328 iterates over any existing conflicts prompting the user for actions to take
329 on each conflicted file.
330 For each file, the following actions are available:
332 .Bl -tag -width "(tf) theirs-full" -compact
334 Ignore this conflict for now.
336 Show all changes made to the merged file as a unified diff.
338 Change the merged file in an editor.
340 Install the merged version of the file into the destination directory.
342 Use the version of the file in the destination directory and ignore any
343 changes made to the file in the
347 Use the version of the file from the
349 tree and discard any local changes made to the file.
351 Display the list of commands.
356 mode is used to restore the stock versions of files.
359 installs the stock version of requested files.
360 This mode cannot be used to restore directories, only individual files.
364 mode shows a summary of the results of the most recent merge.
365 First it lists any files for which there are unresolved conflicts.
366 Next it lists any warnings generated during the last merge.
367 If the last merge did not generate any conflicts or warnings,
368 then nothing will be output.
370 The following options are available.
371 Note that most options do not apply to all modes.
372 .Bl -tag -width ".Fl A Ar patterns"
374 Always install the new version of any files that match any of the patterns
377 Each pattern is evaluated as an
380 This option may be specified multiple times to specify multiple patterns.
381 Multiple space-separated patterns may also be specified in a single
383 Note that ignored files specified via the
387 option will not be installed.
389 Do not build generated files in a private object tree.
391 reuse the generated files from a previously built object tree that matches
393 This can be useful to avoid gratuitous conflicts in
396 files when bootstrapping.
397 It can also be useful for building a tarball that matches a specific
400 Specify an alternate destination directory as the target of a merge.
401 This is analogous to the
404 .Sq make installworld .
405 The default destination directory is an empty string which results in
408 on the local machine.
410 Specify an alternate directory to use as the work directory.
411 The work directory is used to store the
415 trees as well as unresolved conflicts.
416 The default work directory is
417 .Pa <destdir>/var/db/etcupdate .
419 Ignore changes in the FreeBSD ID string when comparing files in the
420 destination directory to files in either of the
428 this reduces noise due to FreeBSD ID string changes in the output.
429 During an update this can simplify handling for harmless conflicts caused
430 by FreeBSD ID string changes.
433 if a file in the destination directory is identical to the same file in the
435 tree modulo the FreeBSD ID string,
436 then the file is treated as if it was unmodified and the
438 version of the file will be installed.
440 if a file in the destination directory is identical to the same file in the
442 tree modulo the FreeBSD ID string,
445 version of the file will be installed to update the ID string.
450 versions of the file are identical,
453 will not change the file in the destination directory.
455 Due to limitations in the
458 this option may not have an effect if there are other changes in a file that
459 are close to the FreeBSD ID string.
461 Ignore any files that match any of the patterns listed in
463 No warnings or other messages will be generated for those files during a
465 Each pattern is evaluated as an
468 This option may be specified multiple times to specify multiple patterns.
469 Multiple space-separated patterns may also be specified in a single
472 Specify an alternate path for the log file.
475 utility logs each command that it invokes along with the standard output
476 and standard error to this file.
477 By default the log file is stored in a file named
479 in the work directory.
483 as additional parameters to
488 This can be used for to set the
492 variables for a cross-build.
498 binary when building a
505 Do not merge any changes to the destination directory.
507 report what actions would be taken during a merge.
508 Note that the existing
512 trees will not be changed.
515 option is not specified,
518 tree will be extracted to perform the comparison.
522 build when building a
525 The resulting tree will include a corresponding
532 Only merge changes to files that are necessary to successfully run
533 .Sq make installworld
535 .Sq make installkernel .
536 When this flag is enabled,
541 trees are left alone.
543 a temporary tree is populated with the necessary files.
544 This temporary tree is compared against the
547 This allows a normal update to be run after
548 .Sq make installworld
550 Any conflicts generated during a
552 update should be resolved by a
560 trees during a merge.
563 a previous merge operation.
565 Specify an alternate source tree to use when building or extracting a
568 The default source tree is
573 tree from a tarball previously generated by the
575 command rather than building the tree from a source tree.
580 utility can also be configured by setting variables in an optional
581 configuration file named
582 .Pa /etc/etcupdate.conf .
583 Note that command line options override settings in the configuration file.
584 The configuration file is executed by
586 so it uses that syntax to set configuration variables.
587 The following variables can be set:
588 .Bl -tag -width ".Ev ALWAYS_INSTALL"
589 .It Ev ALWAYS_INSTALL
590 Always install files that match any of the patterns listed in this variable
595 Specify an alternate destination directory similar to the
599 Specify a program to edit merge conflicts.
601 Ignore changes in the FreeBSD ID string similar to the
604 This is enabled by setting the variable to a non-empty value.
606 Ignore files that match any of the patterns listed in this variable
611 Specify an alternate path for the log file similar to the
617 binary when building a
623 Pass additional options to
631 Specify an alternate source tree similar to the
635 Specify an alternate work directory similar to the
642 utility uses the program identified in the
644 environment variable to edit merge conflicts.
649 is used as the default editor.
651 .Bl -tag -width ".Pa /var/db/etcupdate/log" -compact
652 .It Pa /etc/etcupdate.conf
653 Optional config file.
654 .It Pa /var/db/etcupdate
655 Default work directory used to store trees and other data.
656 .It Pa /var/db/etcupdate/log
662 To compare the files in
664 with the stock versions:
668 To merge changes after an upgrade via the buildworld and installworld process:
672 To resolve any conflicts generated during a merge:
674 .Dl "etcupdate resolve"
678 utility may need to be bootstrapped before it can be used.
681 command will fail with an error about a missing reference tree if
682 bootstrapping is needed.
686 requires a source tree that matches the currently installed world.
687 The easiest way to ensure this is to bootstrap
689 before updating the source tree to start the next world upgrade cycle.
691 generate a reference tree:
693 .Dl "etcupdate extract"
698 command to compare the reference tree to your current files in
700 Undesired differences should be removed using an editor,
702 or by copying files from the reference tree
705 .Pa /var/db/etcupdate/current
712 is already newer than the currently installed world,
713 a new tree matching the currently installed world can be checked out to
714 a temporary location.
715 The reference tree for
717 can then be generated via:
719 .Dl "etcupdate extract -s /path/to/tree"
723 command can be used as above to remove undesired differences.
725 the changes in the tree at
727 can be merged via a regular merge.
729 The following warning messages may be generated during a merge.
730 Note that several of these warnings cover obscure cases that should occur
731 rarely if at all in practice.
733 if a file changes from a file to a directory in the
736 and the file was modified in the destination directory,
737 then a warning will be triggered.
739 when a warning references a pathname,
740 the corresponding file in the destination directory is not changed by a
743 .It "Directory mismatch: <path> (<type>)"
744 An attempt was made to create a directory at
746 but an existing file of type
748 already exists for that path name.
749 .It "Modified link changed: <file> (<old> became <new>)"
750 The target of a symbolic link named
759 The symbolic link has been modified to point to a target that is neither
763 in the destination directory.
764 .It "Modified mismatch: <file> (<new> vs <dest>)"
772 but the file exists as a different type
774 in the destination directory.
775 .It "Modified <type> changed: <file> (<old> became <new>)"
787 The file in the destination directory of type
790 so it could not be merged automatically.
791 .It "Modified <type> remains: <file>"
796 has been removed from the
799 but it has been locally modified.
800 The modified version of the file remains in the destination directory.
801 .It "Needs update: /etc/localtime (required manual update via tzsetup(8))"
807 was not able to refresh
809 from its source file in
810 .Fa /usr/share/zoneinfo .
817 permitting future updates to refresh
820 .It "Needs update: /etc/mail/aliases.db (required manual update via newaliases(1))"
822 .Pa /etc/mail/aliases
823 was updated during a merge with a non-empty destination directory.
824 Due to a limitation of the
828 was not able to automatically update the corresponding aliases database.
829 .It "New file mismatch: <file> (<new> vs <dest>)"
834 has been added to the
837 A file of that name already exists in the destination directory,
838 but it is of a different type
840 .It "New link conflict: <file> (<new> vs <dest>)"
841 A symbolic link named
843 has been added to the
847 A symbolic link of the same name already exists in the destination
849 but it links to a different target
851 .It "Non-empty directory remains: <file>"
857 but it contains additional files in the destination directory.
858 These additional files as well as the directory remain.
859 .It "Remove mismatch: <file> (<old> became <new>)"
871 but it has been removed in the destination directory.
872 .It "Removed file changed: <file>"
878 but it has been removed in the destination directory.
879 .It "Removed link changed: <file> (<old> became <new>)"
880 The target of a symbolic link named
889 but it has been removed in the destination directory.
899 .Xr services_mkdb 8 ,
904 utility first appeared in
909 utility was written by
910 .An John Baldwin Aq Mt jhb@FreeBSD.org .
912 Rerunning a merge does not automatically delete conflicts left over from a
914 Any conflicts must be resolved before the merge can be rerun.
915 It is not clear if this is a feature or a bug.
917 There is no way to easily automate conflict resolution for specific files.
918 For example, one can imagine a syntax along the lines of
920 .Dl "etcupdate resolve tf /some/file"
922 to resolve a specific conflict in an automated fashion.
926 often results in gratuitous diffs in
928 that cause conflicts in the first merge.
929 If an object tree that matches the source tree is present when bootstrapping,
934 command can work around this.