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
33 .Nd "manage updates to system files not updated by installworld"
38 .Op Fl r | Fl s Ar source | Fl t Ar tarball
62 .Op Fl s Ar source | Fl t Ar tarball
84 utility is a tool for managing updates to files that are not updated as
89 It manages updates by doing a three-way merge of changes made to these
90 files against the local versions.
91 It is also designed to minimize the amount of user intervention with
92 the goal of simplifying upgrades for clusters of machines.
94 To perform a three-way merge,
96 keeps copies of the current and previous versions of files that it manages.
97 These copies are stored in two trees known as the
108 copies of each file to determine which changes need to be merged into the
109 local version of each file.
110 If a file can be updated without generating a conflict,
112 will update the file automatically.
113 If the local changes to a file conflict with the changes made to a file in
115 then a merge conflict is generated.
116 The conflict must be resolved after the merge has finished.
119 utility will not perform a new merge until all conflicts from an earlier
124 utility supports several modes of operation.
125 The mode is specified via an optional command argument.
126 If present, the command must be the first argument on the command line.
127 If a command is not specified, the default mode is used.
129 The default mode merges changes from the source tree to the destination
138 it compares the two trees merging changes into the destination directory.
140 it displays warnings for any conditions it could not handle automatically.
144 option is not specified,
145 then the first step taken is to update the
153 then that tree is saved as the
158 tree is removed if it exists.
161 tree is built from a source tree.
163 if a tarball is specified via the
166 then the tree is extracted from that tarball instead.
170 compares the files in the
175 If a file was removed from the
178 then it will be removed from the destination directory only if it
179 does not have any local modifications.
180 If a file was added to the
183 then it will be copied to the destination directory only if it
184 would not clobber an existing file.
185 If a file is changed in the
190 will attempt to merge the changes into the version of the file in the
191 destination directory.
192 If the merge encounters conflicts,
193 then a version of the file with conflict markers will be saved for
195 If the merge does not encounter conflicts,
196 then the merged version of the file will be saved in the destination
200 is not able to safely merge in changes to a file other than a merge conflict,
201 it will generate a warning.
203 For each file that is updated a line will be output with a leading character
204 to indicate the action taken.
205 The possible actions follow:
207 .Bl -tag -width "A" -compact -offset indent
221 if any warnings were encountered they are displayed after the merge has
224 Note that for certain files
226 will perform post-install actions any time that the file is updated.
230 .Pa /etc/master.passwd
234 .Pa /etc/login.conf.db
240 .Pa /etc/mail/aliases
257 One exception is that if
258 .Pa /etc/mail/aliases
259 is changed and the destination directory is not the default,
260 then a warning will be issued instead.
261 This is due to a limitation of the
267 is changed and the destination directory is not the default,
270 will not be executed due to a limitation of that script.
271 In this case no warning is issued as the result of
273 is merely cosmetic and will be corrected on the next reboot.
277 mode is used to build a tarball that contains a snapshot of a
280 This tarball can be used by the default and extract modes.
281 Using a tarball can allow
283 to perform a merge without requiring a source tree that matches the
284 currently installed world.
287 argument specifies the name of the file to create.
295 mode compares the versions of files in the destination directory to the
297 tree and generates a unified format diff of the changes.
298 This can be used to determine which files have been locally modified and how.
301 does not manage files that are not maintained in the source tree such as
311 Unlike the default mode,
312 it does not save any existing
314 tree and does not modify any existing
319 tree can either be built from a source tree or extracted from a tarball.
323 mode is used to resolve any conflicts encountered during a merge.
326 iterates over any existing conflicts prompting the user for actions to take
327 on each conflicted file.
328 For each file, the following actions are available:
330 .Bl -tag -width "(tf) theirs-full" -compact
332 Ignore this conflict for now.
334 Show all changes made to the merged file as a unified diff.
336 Change the merged file in an editor.
338 Install the merged version of the file into the destination directory.
340 Use the version of the file in the destination directory and ignore any
341 changes made to the file in the
345 Use the version of the file from the
347 tree and discard any local changes made to the file.
349 Display the list of commands.
354 mode is used to restore the stock versions of files.
357 installs the stock version of requested files.
358 This mode cannot be used to restore directories, only individual files.
362 mode shows a summary of the results of the most recent merge.
363 First it lists any files for which there are unresolved conflicts.
364 Next it lists any warnings generated during the last merge.
365 If the last merge did not generate any conflicts or warnings,
366 then nothing will be output.
368 The following options are available.
369 Note that most options do not apply to all modes.
370 .Bl -tag -width ".Fl A Ar patterns"
372 Always install the new version of any files that match any of the patterns
375 Each pattern is evaluated as an
378 This option may be specified multiple times to specify multiple patterns.
379 Multiple space-separated patterns may also be specified in a single
381 Note that ignored files specified via the
385 option will not be installed.
387 Do not build generated files in a private object tree.
389 reuse the generated files from a previously built object tree that matches
391 This can be useful to avoid gratuitous conflicts in
394 files when bootstrapping.
395 It can also be useful for building a tarball that matches a specific
398 Specify an alternate destination directory as the target of a merge.
399 This is analogous to the
402 .Sq make installworld .
403 The default destination directory is an empty string which results in
406 on the local machine.
408 Specify an alternate directory to use as the work directory.
409 The work directory is used to store the
413 trees as well as unresolved conflicts.
414 The default work directory is
415 .Pa <destdir>/var/db/etcupdate .
417 Ignore changes in the FreeBSD ID string when comparing files in the
418 destination directory to files in either of the
426 this reduces noise due to FreeBSD ID string changes in the output.
427 During an update this can simplify handling for harmless conflicts caused
428 by FreeBSD ID string changes.
431 if a file in the destination directory is identical to the same file in the
433 tree modulo the FreeBSD ID string,
434 then the file is treated as if it was unmodified and the
436 version of the file will be installed.
438 if a file in the destination directory is identical to the same file in the
440 tree modulo the FreeBSD ID string,
443 version of the file will be installed to update the ID string.
448 versions of the file are identical,
451 will not change the file in the destination directory.
453 Due to limitations in the
456 this option may not have an effect if there are other changes in a file that
457 are close to the FreeBSD ID string.
459 Ignore any files that match any of the patterns listed in
461 No warnings or other messages will be generated for those files during a
463 Each pattern is evaluated as an
466 This option may be specified multiple times to specify multiple patterns.
467 Multiple space-separated patterns may also be specified in a single
470 Specify an alternate path for the log file.
473 utility logs each command that it invokes along with the standard output
474 and standard error to this file.
475 By default the log file is stored in a file named
477 in the work directory.
481 as additional parameters to
486 This can be used for to set the
490 variables for a cross-build.
495 Do not merge any changes to the destination directory.
497 report what actions would be taken during a merge.
498 Note that the existing
502 trees will not be changed.
505 option is not specified,
508 tree will be extracted to perform the comparison.
513 Only merge changes to files that are necessary to successfully run
514 .Sq make installworld
516 .Sq make installkernel .
517 When this flag is enabled,
522 trees are left alone.
524 a temporary tree is populated with the necessary files.
525 This temporary tree is compared against the
528 This allows a normal update to be run after
529 .Sq make installworld
531 Any conflicts generated during a
533 update should be resolved by a
541 trees during a merge.
544 a previous merge operation.
546 Specify an alternate source tree to use when building or extracting a
549 The default source tree is
554 tree from a tarball previously generated by the
556 command rather than building the tree from a source tree.
561 utility can also be configured by setting variables in an optional
562 configuration file named
563 .Pa /etc/etcupdate.conf .
564 Note that command line options override settings in the configuration file.
565 The configuration file is executed by
567 so it uses that syntax to set configuration variables.
568 The following variables can be set:
569 .Bl -tag -width ".Ev ALWAYS_INSTALL"
570 .It Ev ALWAYS_INSTALL
571 Always install files that match any of the patterns listed in this variable
576 Specify an alternate destination directory similar to the
580 Specify a program to edit merge conflicts.
582 Ignore changes in the FreeBSD ID string similar to the
585 This is enabled by setting the variable to a non-empty value.
587 Ignore files that match any of the patterns listed in this variable
592 Specify an alternate path for the log file similar to the
596 Pass additional options to
604 Specify an alternate source tree similar to the
608 Specify an alternate work directory similar to the
615 utility uses the program identified in the
617 environment variable to edit merge conflicts.
622 is used as the default editor.
624 .Bl -tag -width ".Pa /var/db/etcupdate/log" -compact
625 .It Pa /etc/etcupdate.conf
626 Optional config file.
627 .It Pa /var/db/etcupdate
628 Default work directory used to store trees and other data.
629 .It Pa /var/db/etcupdate/log
635 To compare the files in
637 with the stock versions:
641 To merge changes after an upgrade via the buildworld and installworld process:
645 To resolve any conflicts generated during a merge:
647 .Dl "etcupdate resolve"
651 utility may need to be bootstrapped before it can be used.
654 command will fail with an error about a missing reference tree if
655 bootstrapping is needed.
659 requires a source tree that matches the currently installed world.
660 The easiest way to ensure this is to bootstrap
662 before updating the source tree to start the next world upgrade cycle.
664 generate a reference tree:
666 .Dl "etcupdate extract"
671 command to compare the reference tree to your current files in
673 Undesired differences should be removed using an editor,
675 or by copying files from the reference tree
678 .Pa /var/db/etcupdate/current
685 is already newer than the currently installed world,
686 a new tree matching the currently installed world can be checked out to
687 a temporary location.
688 The reference tree for
690 can then be generated via:
692 .Dl "etcupdate extract -s /path/to/tree"
696 command can be used as above to remove undesired differences.
698 the changes in the tree at
700 can be merged via a regular merge.
702 The following warning messages may be generated during a merge.
703 Note that several of these warnings cover obscure cases that should occur
704 rarely if at all in practice.
706 if a file changes from a file to a directory in the
709 and the file was modified in the destination directory,
710 then a warning will be triggered.
712 when a warning references a pathname,
713 the corresponding file in the destination directory is not changed by a
716 .It "Directory mismatch: <path> (<type>)"
717 An attempt was made to create a directory at
719 but an existing file of type
721 already exists for that path name.
722 .It "Modified link changed: <file> (<old> became <new>)"
723 The target of a symbolic link named
732 The symbolic link has been modified to point to a target that is neither
736 in the destination directory.
737 .It "Modified mismatch: <file> (<new> vs <dest>)"
745 but the file exists as a different type
747 in the destination directory.
748 .It "Modified <type> changed: <file> (<old> became <new>)"
760 The file in the destination directory of type
763 so it could not be merged automatically.
764 .It "Modified <type> remains: <file>"
769 has been removed from the
772 but it has been locally modified.
773 The modified version of the file remains in the destination directory.
774 .It "Needs update: /etc/localtime (required manual update via tzsetup(8))"
780 was not able to refresh
782 from its source file in
783 .Fa /usr/share/zoneinfo .
790 permitting future updates to refresh
793 .It "Needs update: /etc/mail/aliases.db (required manual update via newaliases(1))"
795 .Pa /etc/mail/aliases
796 was updated during a merge with a non-empty destination directory.
797 Due to a limitation of the
801 was not able to automatically update the corresponding aliases database.
802 .It "New file mismatch: <file> (<new> vs <dest>)"
807 has been added to the
810 A file of that name already exists in the destination directory,
811 but it is of a different type
813 .It "New link conflict: <file> (<new> vs <dest>)"
814 A symbolic link named
816 has been added to the
820 A symbolic link of the same name already exists in the destination
822 but it links to a different target
824 .It "Non-empty directory remains: <file>"
830 but it contains additional files in the destination directory.
831 These additional files as well as the directory remain.
832 .It "Remove mismatch: <file> (<old> became <new>)"
844 but it has been removed in the destination directory.
845 .It "Removed file changed: <file>"
851 but it has been removed in the destination directory.
852 .It "Removed link changed: <file> (<old> became <new>)"
853 The target of a symbolic link named
862 but it has been removed in the destination directory.
871 .Xr services_mkdb 8 ,
876 utility first appeared in
881 utility was written by
882 .An John Baldwin Aq Mt jhb@FreeBSD.org .
884 Rerunning a merge does not automatically delete conflicts left over from a
886 Any conflicts must be resolved before the merge can be rerun.
887 It is not clear if this is a feature or a bug.
889 There is no way to easily automate conflict resolution for specific files.
890 For example, one can imagine a syntax along the lines of
892 .Dl "etcupdate resolve tf /some/file"
894 to resolve a specific conflict in an automated fashion.
898 often results in gratuitous diffs in
900 that cause conflicts in the first merge.
901 If an object tree that matches the source tree is present when bootstrapping,
906 command can work around this.