3 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
5 # Copyright (c) 2010-2013 Hudson River Trading LLC
6 # Written by: John H. Baldwin <jhb@FreeBSD.org>
9 # Redistribution and use in source and binary forms, with or without
10 # modification, are permitted provided that the following conditions
12 # 1. Redistributions of source code must retain the above copyright
13 # notice, this list of conditions and the following disclaimer.
14 # 2. Redistributions in binary form must reproduce the above copyright
15 # notice, this list of conditions and the following disclaimer in the
16 # documentation and/or other materials provided with the distribution.
18 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
19 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21 # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
22 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 # This is a tool to manage updating files that are not updated as part
33 # of 'make installworld' such as files in /etc. Unlike other tools,
34 # this one is specifically tailored to assisting with mass upgrades.
35 # To that end it does not require user intervention while running.
37 # Theory of operation:
39 # The most reliable way to update changes to files that have local
40 # modifications is to perform a three-way merge between the original
41 # unmodified file, the new version of the file, and the modified file.
42 # This requires having all three versions of the file available when
43 # performing an update.
45 # To that end, etcupdate uses a strategy where the current unmodified
46 # tree is kept in WORKDIR/current and the previous unmodified tree is
47 # kept in WORKDIR/old. When performing a merge, a new tree is built
48 # if needed and then the changes are merged into DESTDIR. Any files
49 # with unresolved conflicts after the merge are left in a tree rooted
50 # at WORKDIR/conflicts.
52 # To provide extra flexibility, etcupdate can also build tarballs of
53 # root trees that can later be used. It can also use a tarball as the
54 # source of a new tree instead of building it from /usr/src.
56 # Global settings. These can be adjusted by config files and in some
57 # cases by command line options.
60 # - automatable conflict resolution
65 usage: etcupdate [-npBF] [-d workdir] [-r | -s source | -t tarball]
66 [-A patterns] [-D destdir] [-I patterns] [-L logfile]
68 etcupdate build [-B] [-d workdir] [-s source] [-L logfile] [-M options]
70 etcupdate diff [-d workdir] [-D destdir] [-I patterns] [-L logfile]
71 etcupdate extract [-B] [-d workdir] [-s source | -t tarball]
72 [-D destdir] [-L logfile] [-M options]
73 etcupdate resolve [-p] [-d workdir] [-D destdir] [-L logfile]
74 etcupdate revert [-d workdir] [-D destdir] [-L logfile] file ...
75 etcupdate status [-d workdir] [-D destdir]
80 # Used to write a message prepended with '>>>' to the logfile.
86 # Used for assertion conditions that should never happen.
93 # Used to write a warning message. These are saved to the WARNINGS
94 # file with " " prepended.
97 echo -n " " >> $WARNINGS
98 echo "$@" >> $WARNINGS
101 # Output a horizontal rule using the passed-in character. Matches the
102 # length used for Index lines in CVS and SVN diffs.
110 # Output a text description of a specified file's type.
112 # $1 - file pathname.
115 stat -f "%HT" $1 | tr "[:upper:]" "[:lower:]"
118 # Returns true (0) if a file exists
120 # $1 - file pathname.
126 # Returns true (0) if a file should be ignored, false otherwise.
134 for pattern in $IGNORE_FILES; do
144 # Ignore /.cshrc and /.profile if they are hardlinked to the
145 # same file in /root. This ensures we only compare those
146 # files once in that case.
149 if [ ${DESTDIR}$1 -ef ${DESTDIR}/root$1 ]; then
160 # Returns true (0) if the new version of a file should always be
161 # installed rather than attempting to do a merge.
169 for pattern in $ALWAYS_INSTALL; do
182 # Build a new tree. This runs inside a subshell to trap SIGINT.
184 # $1 - directory to store new tree in
187 local destdir dir file make
189 make="make $MAKE_OPTIONS -DNO_FILEMON"
191 log "Building tree at $1 with $make"
197 destdir=`realpath $1`
199 if [ -n "$preworld" ]; then
200 # Build a limited tree that only contains files that are
201 # crucial to installworld.
202 for file in $PREWORLD_FILES; do
203 name=$(basename $file)
204 mkdir -p $1/etc || return 1
205 cp -p $SRCDIR/$file $1/etc/$name || return 1
207 elif ! [ -n "$nobuild" ]; then
208 (cd $SRCDIR; $make DESTDIR=$destdir distrib-dirs &&
209 MAKEOBJDIRPREFIX=$destdir/usr/obj $make _obj SUBDIR_OVERRIDE=etc &&
210 MAKEOBJDIRPREFIX=$destdir/usr/obj $make everything SUBDIR_OVERRIDE=etc &&
211 MAKEOBJDIRPREFIX=$destdir/usr/obj $make DESTDIR=$destdir distribution) || \
214 (cd $SRCDIR; $make DESTDIR=$destdir distrib-dirs &&
215 $make DESTDIR=$destdir distribution) || return 1
217 chflags -R noschg $1 || return 1
218 rm -rf $1/usr/obj || return 1
220 # Purge auto-generated files. Only the source files need to
221 # be updated after which these files are regenerated.
222 rm -f $1/etc/*.db $1/etc/passwd $1/var/db/services.db || return 1
224 # Remove empty files. These just clutter the output of 'diff'.
225 find $1 -type f -size 0 -delete || return 1
227 # Trim empty directories.
228 find -d $1 -type d -empty -delete || return 1
232 # Generate a new tree. If tarball is set, then the tree is
233 # extracted from the tarball. Otherwise the tree is built from a
236 # $1 - directory to store new tree in
241 # If we have a tarball, extract that into the new directory.
242 if [ -n "$tarball" ]; then
244 if [ -n "$preworld" ]; then
245 files="$PREWORLD_FILES"
247 if ! (mkdir -p $1 && tar xf $tarball -C $1 $files) \
249 echo "Failed to extract new tree."
254 if ! build_tree $1; then
255 echo "Failed to build new tree."
262 # Forcefully remove a tree. Returns true (0) if the operation succeeds.
270 chflags -R noschg $1 >&3 2>&1
276 # Return values for compare()
284 # Compare two files/directories/symlinks. Note that this does not
285 # recurse into subdirectories. Instead, if two nodes are both
286 # directories, they are assumed to be equivalent.
288 # Returns true (0) if the nodes are identical. If only one of the two
289 # nodes are present, return one of the COMPARE_ONLY* constants. If
290 # the nodes are different, return one of the COMPARE_DIFF* constants
291 # to indicate the type of difference.
299 # If the first node doesn't exist, then check for the second
300 # node. Note that -e will fail for a symbolic link that
301 # points to a missing target.
304 return $COMPARE_ONLYSECOND
306 return $COMPARE_EQUAL
308 elif ! exists $2; then
309 return $COMPARE_ONLYFIRST
312 # If the two nodes are different file types fail.
313 first=`stat -f "%Hp" $1`
314 second=`stat -f "%Hp" $2`
315 if [ "$first" != "$second" ]; then
316 return $COMPARE_DIFFTYPE
319 # If both are symlinks, compare the link values.
323 if [ "$first" = "$second" ]; then
324 return $COMPARE_EQUAL
326 return $COMPARE_DIFFLINKS
330 # If both are files, compare the file contents.
332 if cmp -s $1 $2; then
333 return $COMPARE_EQUAL
335 return $COMPARE_DIFFFILES
339 # As long as the two nodes are the same type of file, consider
341 return $COMPARE_EQUAL
344 # Returns true (0) if the only difference between two regular files is a
345 # change in the FreeBSD ID string.
347 # $1 - path of first file
348 # $2 - path of second file
352 diff -qI '\$FreeBSD.*\$' $1 $2 >/dev/null 2>&1
355 # This is a wrapper around compare that will return COMPARE_EQUAL if
356 # the only difference between two regular files is a change in the
357 # FreeBSD ID string. It only makes this adjustment if the -F flag has
369 if [ -n "$FREEBSD_ID" -a "$cmp" -eq $COMPARE_DIFFFILES ] && \
370 fbsdid_only $1 $2; then
371 return $COMPARE_EQUAL
377 # Returns true (0) if a directory is empty.
379 # $1 - pathname of the directory to check
388 # Returns true (0) if one directories contents are a subset of the
389 # other. This will recurse to handle subdirectories and compares
390 # individual files in the trees. Its purpose is to quiet spurious
391 # directory warnings for dryrun invocations.
393 # $1 - first directory (sub)
394 # $2 - second directory (super)
399 if ! [ -d $1 -a -d $2 ]; then
403 # Ignore files that are present in the second directory but not
406 for file in $contents; do
407 if ! compare $1/$file $2/$file; then
411 if [ -d $1/$file ]; then
412 if ! dir_subset $1/$file $2/$file; then
420 # Returns true (0) if a directory in the destination tree is empty.
421 # If this is a dryrun, then this returns true as long as the contents
422 # of the directory are a subset of the contents in the old tree
423 # (meaning that the directory would be empty in a non-dryrun when this
424 # was invoked) to quiet spurious warnings.
426 # $1 - pathname of the directory to check relative to DESTDIR.
430 if [ -n "$dryrun" ]; then
431 dir_subset $DESTDIR/$1 $OLDTREE/$1
435 empty_dir $DESTDIR/$1
438 # Output a diff of two directory entries with the same relative name
439 # in different trees. Note that as with compare(), this does not
440 # recurse into subdirectories. If the nodes are identical, nothing is
446 # $4 - label for first tree
447 # $5 - label for second tree
450 local first second file old new diffargs
452 if [ -n "$FREEBSD_ID" ]; then
453 diffargs="-I \\\$FreeBSD.*\\\$"
458 compare_fbsdid $1/$3 $2/$3
473 first=`file_type $1/$3`
474 second=`file_type $2/$3`
476 echo "Node changed from a $first to a $second: $3"
480 first=`readlink $1/$file`
481 second=`readlink $2/$file`
483 echo "Link changed: $file"
492 diff -u $diffargs -L "$3 ($4)" $1/$3 -L "$3 ($5)" $2/$3
497 # Run one-off commands after an update has completed. These commands
498 # are not tied to a specific file, so they cannot be handled by
499 # post_install_file().
504 # None of these commands should be run for a pre-world update.
505 if [ -n "$preworld" ]; then
509 # If /etc/localtime exists and is not a symlink and /var/db/zoneinfo
510 # exists, run tzsetup -r to refresh /etc/localtime.
511 if [ -f ${DESTDIR}/etc/localtime -a \
512 ! -L ${DESTDIR}/etc/localtime ]; then
513 if [ -f ${DESTDIR}/var/db/zoneinfo ]; then
514 if [ -n "${DESTDIR}" ]; then
519 log "tzsetup -r ${args}"
520 if [ -z "$dryrun" ]; then
521 tzsetup -r ${args} >&3 2>&1
524 warn "Needs update: /etc/localtime (required" \
525 "manual update via tzsetup(8))"
530 # Create missing parent directories of a node in a target tree
531 # preserving the owner, group, and permissions from a specified
536 # $3 - pathname of the node (relative to both trees)
543 # Nothing to do if the parent directory exists. This also
544 # catches the degenerate cases when the path is just a simple
546 if [ -d ${2}$dir ]; then
550 # If non-directory file exists with the desired directory
552 if exists ${2}$dir; then
553 # If this is a dryrun and we are installing the
554 # directory in the DESTDIR and the file in the DESTDIR
555 # matches the file in the old tree, then fake success
556 # to quiet spurious warnings.
557 if [ -n "$dryrun" -a "$2" = "$DESTDIR" ]; then
558 if compare $OLDTREE/$dir $DESTDIR/$dir; then
563 args=`file_type ${2}$dir`
564 warn "Directory mismatch: ${2}$dir ($args)"
568 # Ensure the parent directory of the directory is present
570 if ! install_dirs $1 "$2" $dir; then
574 # Format attributes from template directory as install(1)
576 args=`stat -f "-o %Su -g %Sg -m %0Mp%0Lp" $1/$dir`
578 log "install -d $args ${2}$dir"
579 if [ -z "$dryrun" ]; then
580 install -d $args ${2}$dir >&3 2>&1
585 # Perform post-install fixups for a file. This largely consists of
586 # regenerating any files that depend on the newly installed file.
588 # $1 - pathname of the updated file (relative to DESTDIR)
593 # Grr, newaliases only works for an empty DESTDIR.
594 if [ -z "$DESTDIR" ]; then
596 if [ -z "$dryrun" ]; then
603 /usr/share/certs/trusted/* | /usr/share/certs/untrusted/*)
605 if [ -z "$dryrun" ]; then
606 env DESTDIR=${DESTDIR} certctl rehash >&3 2>&1
610 log "cap_mkdb ${DESTDIR}$1"
611 if [ -z "$dryrun" ]; then
612 cap_mkdb ${DESTDIR}$1 >&3 2>&1
616 log "pwd_mkdb -p -d $DESTDIR/etc ${DESTDIR}$1"
617 if [ -z "$dryrun" ]; then
618 pwd_mkdb -p -d $DESTDIR/etc ${DESTDIR}$1 \
623 # /etc/rc.d/motd hardcodes the /etc/motd path.
624 # Don't warn about non-empty DESTDIR's since this
625 # change is only cosmetic anyway.
626 if [ -z "$DESTDIR" ]; then
627 log "sh /etc/rc.d/motd start"
628 if [ -z "$dryrun" ]; then
629 sh /etc/rc.d/motd start >&3 2>&1
634 log "services_mkdb -q -o $DESTDIR/var/db/services.db" \
636 if [ -z "$dryrun" ]; then
637 services_mkdb -q -o $DESTDIR/var/db/services.db \
638 ${DESTDIR}$1 >&3 2>&1
644 # Install the "new" version of a file. Returns true if it succeeds
645 # and false otherwise.
647 # $1 - pathname of the file to install (relative to DESTDIR)
651 if ! install_dirs $NEWTREE "$DESTDIR" $1; then
654 log "cp -Rp ${NEWTREE}$1 ${DESTDIR}$1"
655 if [ -z "$dryrun" ]; then
656 cp -Rp ${NEWTREE}$1 ${DESTDIR}$1 >&3 2>&1
662 # Install the "resolved" version of a file. Returns true if it succeeds
663 # and false otherwise.
665 # $1 - pathname of the file to install (relative to DESTDIR)
669 # This should always be present since the file is already
670 # there (it caused a conflict). However, it doesn't hurt to
672 if ! install_dirs $NEWTREE "$DESTDIR" $1; then
676 # Use cat rather than cp to preserve metadata
677 log "cat ${CONFLICTS}$1 > ${DESTDIR}$1"
678 cat ${CONFLICTS}$1 > ${DESTDIR}$1 2>&3
683 # Generate a conflict file when a "new" file conflicts with an
684 # existing file in DESTDIR.
686 # $1 - pathname of the file that conflicts (relative to DESTDIR)
690 if [ -n "$dryrun" ]; then
694 install_dirs $NEWTREE $CONFLICTS $1
695 diff --changed-group-format='<<<<<<< (local)
698 ' $DESTDIR/$1 $NEWTREE/$1 > $CONFLICTS/$1
701 # Remove the "old" version of a file.
703 # $1 - pathname of the old file to remove (relative to DESTDIR)
706 log "rm -f ${DESTDIR}$1"
707 if [ -z "$dryrun" ]; then
708 rm -f ${DESTDIR}$1 >&3 2>&1
713 # Update a file that has no local modifications.
715 # $1 - pathname of the file to update (relative to DESTDIR)
720 # If the old file is a directory, then remove it with rmdir
721 # (this should only happen if the file has changed its type
722 # from a directory to a non-directory). If the directory
723 # isn't empty, then fail. This will be reported as a warning
725 if [ -d $DESTDIR/$1 ]; then
726 if empty_destdir $1; then
727 log "rmdir ${DESTDIR}$1"
728 if [ -z "$dryrun" ]; then
729 rmdir ${DESTDIR}$1 >&3 2>&1
735 # If both the old and new files are regular files, leave the
736 # existing file. This avoids breaking hard links for /.cshrc
737 # and /.profile. Otherwise, explicitly remove the old file.
738 elif ! [ -f ${DESTDIR}$1 -a -f ${NEWTREE}$1 ]; then
739 log "rm -f ${DESTDIR}$1"
740 if [ -z "$dryrun" ]; then
741 rm -f ${DESTDIR}$1 >&3 2>&1
745 # If the new file is a directory, note that the old file has
746 # been removed, but don't do anything else for now. The
747 # directory will be installed if needed when new files within
748 # that directory are installed.
749 if [ -d $NEWTREE/$1 ]; then
750 if empty_dir $NEWTREE/$1; then
755 elif install_new $1; then
761 # Update the FreeBSD ID string in a locally modified file to match the
762 # FreeBSD ID string from the "new" version of the file.
764 # $1 - pathname of the file to update (relative to DESTDIR)
769 # If the FreeBSD ID string is removed from the local file,
770 # there is nothing to do. In this case, treat the file as
771 # updated. Otherwise, if either file has more than one
772 # FreeBSD ID string, just punt and let the user handle the
774 new=`grep -c '\$FreeBSD.*\$' ${NEWTREE}$1`
775 dest=`grep -c '\$FreeBSD.*\$' ${DESTDIR}$1`
776 if [ "$dest" -eq 0 ]; then
779 if [ "$dest" -ne 1 -o "$dest" -ne 1 ]; then
783 # If the FreeBSD ID string in the new file matches the FreeBSD ID
784 # string in the local file, there is nothing to do.
785 new=`grep '\$FreeBSD.*\$' ${NEWTREE}$1`
786 dest=`grep '\$FreeBSD.*\$' ${DESTDIR}$1`
787 if [ "$new" = "$dest" ]; then
791 # Build the new file in three passes. First, copy all the
792 # lines preceding the FreeBSD ID string from the local version
793 # of the file. Second, append the FreeBSD ID string line from
794 # the new version. Finally, append all the lines after the
795 # FreeBSD ID string from the local version of the file.
796 file=`mktemp $WORKDIR/etcupdate-XXXXXXX`
797 awk '/\$FreeBSD.*\$/ { exit } { print }' ${DESTDIR}$1 >> $file
798 awk '/\$FreeBSD.*\$/ { print }' ${NEWTREE}$1 >> $file
799 awk '/\$FreeBSD.*\$/ { ok = 1; next } { if (ok) print }' \
800 ${DESTDIR}$1 >> $file
802 # As an extra sanity check, fail the attempt if the updated
803 # version of the file has any differences aside from the
805 if ! fbsdid_only ${DESTDIR}$1 $file; then
810 log "cp $file ${DESTDIR}$1"
811 if [ -z "$dryrun" ]; then
812 cp $file ${DESTDIR}$1 >&3 2>&1
820 # Attempt to update a file that has local modifications. This routine
821 # only handles regular files. If the 3-way merge succeeds without
822 # conflicts, the updated file is installed. If the merge fails, the
823 # merged version with conflict markers is left in the CONFLICTS tree.
825 # $1 - pathname of the file to merge (relative to DESTDIR)
830 # Try the merge to see if there is a conflict.
831 diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > /dev/null 2>&3
835 # No conflicts, so just redo the merge to the
837 log "diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1"
838 if [ -z "$dryrun" ]; then
839 temp=$(mktemp -t etcupdate)
840 diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > ${temp}
841 # Use "cat >" to preserve metadata.
842 cat ${temp} > ${DESTDIR}$1
849 # Conflicts, save a version with conflict markers in
850 # the conflicts directory.
851 if [ -z "$dryrun" ]; then
852 install_dirs $NEWTREE $CONFLICTS $1
853 log "diff3 -m ${DESTDIR}$1 ${CONFLICTS}$1"
854 diff3 -m -L "yours" -L "original" -L "new" \
855 ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > \
861 panic "merge failed with status $res"
866 # Returns true if a file contains conflict markers from a merge conflict.
868 # $1 - pathname of the file to resolve (relative to DESTDIR)
872 egrep -q '^(<{7}|\|{7}|={7}|>{7}) ' $CONFLICTS/$1
875 # Attempt to resolve a conflict. The user is prompted to choose an
876 # action for each conflict. If the user edits the file, they are
877 # prompted again for an action. The process is very similar to
878 # resolving conflicts after an update or merge with Perforce or
879 # Subversion. The prompts are modelled on a subset of the available
880 # commands for resolving conflicts with Subversion.
882 # $1 - pathname of the file to resolve (relative to DESTDIR)
887 echo "Resolving conflict in '$1':"
890 # Only display the resolved command if the file
891 # doesn't contain any conflicts.
892 echo -n "Select: (p) postpone, (df) diff-full, (e) edit,"
893 if ! has_conflicts $1; then
894 echo -n " (r) resolved,"
897 echo -n " (h) help for more options: "
901 diff -u ${DESTDIR}$1 ${CONFLICTS}$1
904 $EDITOR ${CONFLICTS}$1
908 (p) postpone - ignore this conflict for now
909 (df) diff-full - show all changes made to merged file
910 (e) edit - change merged file in an editor
911 (r) resolved - accept merged version of file
912 (mf) mine-full - accept local version of entire file (ignore new changes)
913 (tf) theirs-full - accept new version of entire file (lose local changes)
914 (h) help - show this list
918 # For mine-full, just delete the
919 # merged file and leave the local
920 # version of the file as-is.
928 # If the merged file has conflict
929 # markers, require confirmation.
930 if has_conflicts $1; then
931 echo "File '$1' still has conflicts," \
932 "are you sure? (y/n) "
934 if [ "$junk" != "y" ]; then
939 if ! install_resolved $1; then
940 panic "Unable to install merged" \
947 # For theirs-full, install the new
948 # version of the file over top of the
950 if ! install_new $1; then
951 panic "Unable to install new" \
958 echo "Invalid command."
964 # Handle a file that has been removed from the new tree. If the file
965 # does not exist in DESTDIR, then there is nothing to do. If the file
966 # exists in DESTDIR and is identical to the old version, remove it
967 # from DESTDIR. Otherwise, whine about the conflict but leave the
968 # file in DESTDIR. To handle directories, this uses two passes. The
969 # first pass handles all non-directory files. The second pass handles
970 # just directories and removes them if they are empty.
972 # If -F is specified, and the only difference in the file in DESTDIR
973 # is a change in the FreeBSD ID string, then remove the file.
975 # $1 - pathname of the file (relative to DESTDIR)
976 handle_removed_file()
981 if ignore $file; then
982 log "IGNORE: removed file $file"
986 compare_fbsdid $DESTDIR/$file $OLDTREE/$file
989 if ! [ -d $DESTDIR/$file ]; then
994 panic "Removed file now missing"
997 # Already removed, nothing to do.
999 $COMPARE_DIFFTYPE|$COMPARE_DIFFLINKS|$COMPARE_DIFFFILES)
1000 dest=`file_type $DESTDIR/$file`
1001 warn "Modified $dest remains: $file"
1006 # Handle a directory that has been removed from the new tree. Only
1007 # remove the directory if it is empty.
1009 # $1 - pathname of the directory (relative to DESTDIR)
1010 handle_removed_directory()
1015 if ignore $dir; then
1016 log "IGNORE: removed dir $dir"
1020 if [ -d $DESTDIR/$dir -a -d $OLDTREE/$dir ]; then
1021 if empty_destdir $dir; then
1022 log "rmdir ${DESTDIR}$dir"
1023 if [ -z "$dryrun" ]; then
1024 rmdir ${DESTDIR}$dir >/dev/null 2>&1
1028 warn "Non-empty directory remains: $dir"
1033 # Handle a file that exists in both the old and new trees. If the
1034 # file has not changed in the old and new trees, there is nothing to
1035 # do. If the file in the destination directory matches the new file,
1036 # there is nothing to do. If the file in the destination directory
1037 # matches the old file, then the new file should be installed.
1038 # Everything else becomes some sort of conflict with more detailed
1041 # $1 - pathname of the file (relative to DESTDIR)
1042 handle_modified_file()
1044 local cmp dest file new newdestcmp old
1047 if ignore $file; then
1048 log "IGNORE: modified file $file"
1052 compare $OLDTREE/$file $NEWTREE/$file
1054 if [ $cmp -eq $COMPARE_EQUAL ]; then
1058 if [ $cmp -eq $COMPARE_ONLYFIRST -o $cmp -eq $COMPARE_ONLYSECOND ]; then
1059 panic "Changed file now missing"
1062 compare $NEWTREE/$file $DESTDIR/$file
1064 if [ $newdestcmp -eq $COMPARE_EQUAL ]; then
1068 # If the only change in the new file versus the destination
1069 # file is a change in the FreeBSD ID string and -F is
1070 # specified, just install the new file.
1071 if [ -n "$FREEBSD_ID" -a $newdestcmp -eq $COMPARE_DIFFFILES ] && \
1072 fbsdid_only $NEWTREE/$file $DESTDIR/$file; then
1073 if update_unmodified $file; then
1076 panic "Updating FreeBSD ID string failed"
1080 # If the local file is the same as the old file, install the
1081 # new file. If -F is specified and the only local change is
1082 # in the FreeBSD ID string, then install the new file as well.
1083 if compare_fbsdid $OLDTREE/$file $DESTDIR/$file; then
1084 if update_unmodified $file; then
1089 # If the file was removed from the dest tree, just whine.
1090 if [ $newdestcmp -eq $COMPARE_ONLYFIRST ]; then
1091 # If the removed file matches an ALWAYS_INSTALL glob,
1092 # then just install the new version of the file.
1093 if always_install $file; then
1094 log "ALWAYS: adding $file"
1095 if ! [ -d $NEWTREE/$file ]; then
1096 if install_new $file; then
1103 # If the only change in the new file versus the old
1104 # file is a change in the FreeBSD ID string and -F is
1105 # specified, don't warn.
1106 if [ -n "$FREEBSD_ID" -a $cmp -eq $COMPARE_DIFFFILES ] && \
1107 fbsdid_only $OLDTREE/$file $NEWTREE/$file; then
1113 old=`file_type $OLDTREE/$file`
1114 new=`file_type $NEWTREE/$file`
1115 warn "Remove mismatch: $file ($old became $new)"
1118 old=`readlink $OLDTREE/$file`
1119 new=`readlink $NEWTREE/$file`
1121 "Removed link changed: $file (\"$old\" became \"$new\")"
1124 warn "Removed file changed: $file"
1130 # Treat the file as unmodified and force install of the new
1131 # file if it matches an ALWAYS_INSTALL glob. If the update
1132 # attempt fails, then fall through to the normal case so a
1133 # warning is generated.
1134 if always_install $file; then
1135 log "ALWAYS: updating $file"
1136 if update_unmodified $file; then
1141 # If the only change in the new file versus the old file is a
1142 # change in the FreeBSD ID string and -F is specified, just
1143 # update the FreeBSD ID string in the local file.
1144 if [ -n "$FREEBSD_ID" -a $cmp -eq $COMPARE_DIFFFILES ] && \
1145 fbsdid_only $OLDTREE/$file $NEWTREE/$file; then
1146 if update_freebsdid $file; then
1151 # If the file changed types between the old and new trees but
1152 # the files in the new and dest tree are both of the same
1153 # type, treat it like an added file just comparing the new and
1155 if [ $cmp -eq $COMPARE_DIFFTYPE ]; then
1158 new=`readlink $NEWTREE/$file`
1159 dest=`readlink $DESTDIR/$file`
1161 "New link conflict: $file (\"$new\" vs \"$dest\")"
1171 # If the file has not changed types between the old
1172 # and new trees, but it is a different type in
1173 # DESTDIR, then just warn.
1174 if [ $newdestcmp -eq $COMPARE_DIFFTYPE ]; then
1175 new=`file_type $NEWTREE/$file`
1176 dest=`file_type $DESTDIR/$file`
1177 warn "Modified mismatch: $file ($new vs $dest)"
1184 old=`file_type $OLDTREE/$file`
1185 new=`file_type $NEWTREE/$file`
1186 dest=`file_type $DESTDIR/$file`
1187 warn "Modified $dest changed: $file ($old became $new)"
1190 old=`readlink $OLDTREE/$file`
1191 new=`readlink $NEWTREE/$file`
1193 "Modified link changed: $file (\"$old\" became \"$new\")"
1201 # Handle a file that has been added in the new tree. If the file does
1202 # not exist in DESTDIR, simply copy the file into DESTDIR. If the
1203 # file exists in the DESTDIR and is identical to the new version, do
1204 # nothing. Otherwise, generate a diff of the two versions of the file
1205 # and mark it as a conflict.
1207 # $1 - pathname of the file (relative to DESTDIR)
1210 local cmp dest file new
1213 if ignore $file; then
1214 log "IGNORE: added file $file"
1218 compare $DESTDIR/$file $NEWTREE/$file
1225 panic "Added file now missing"
1227 $COMPARE_ONLYSECOND)
1228 # Ignore new directories. They will be
1229 # created as needed when non-directory nodes
1231 if ! [ -d $NEWTREE/$file ]; then
1232 if install_new $file; then
1241 # Treat the file as unmodified and force install of the new
1242 # file if it matches an ALWAYS_INSTALL glob. If the update
1243 # attempt fails, then fall through to the normal case so a
1244 # warning is generated.
1245 if always_install $file; then
1246 log "ALWAYS: updating $file"
1247 if update_unmodified $file; then
1254 new=`file_type $NEWTREE/$file`
1255 dest=`file_type $DESTDIR/$file`
1256 warn "New file mismatch: $file ($new vs $dest)"
1259 new=`readlink $NEWTREE/$file`
1260 dest=`readlink $DESTDIR/$file`
1261 warn "New link conflict: $file (\"$new\" vs \"$dest\")"
1264 # If the only change in the new file versus
1265 # the destination file is a change in the
1266 # FreeBSD ID string and -F is specified, just
1267 # install the new file.
1268 if [ -n "$FREEBSD_ID" ] && \
1269 fbsdid_only $NEWTREE/$file $DESTDIR/$file; then
1270 if update_unmodified $file; then
1274 "Updating FreeBSD ID string failed"
1284 # Main routines for each command
1286 # Build a new tree and save it in a tarball.
1291 if [ $# -ne 1 ]; then
1292 echo "Missing required tarball."
1297 log "build command: $1"
1299 # Create a temporary directory to hold the tree
1300 dir=`mktemp -d $WORKDIR/etcupdate-XXXXXXX`
1301 if [ $? -ne 0 ]; then
1302 echo "Unable to create temporary directory."
1305 if ! build_tree $dir; then
1306 echo "Failed to build tree."
1310 if ! tar cfj $1 -C $dir . >&3 2>&1; then
1311 echo "Failed to create tarball."
1318 # Output a diff comparing the tree at DESTDIR to the current
1319 # unmodified tree. Note that this diff does not include files that
1320 # are present in DESTDIR but not in the unmodified tree.
1325 if [ $# -ne 0 ]; then
1329 # Requires an unmodified tree to diff against.
1330 if ! [ -d $NEWTREE ]; then
1331 echo "Reference tree to diff against unavailable."
1335 # Unfortunately, diff alone does not quite provide the right
1336 # level of options that we want, so improvise.
1337 for file in `(cd $NEWTREE; find .) | sed -e 's/^\.//'`; do
1338 if ignore $file; then
1342 diffnode $NEWTREE "$DESTDIR" $file "stock" "local"
1346 # Just extract a new tree into NEWTREE either by building a tree or
1347 # extracting a tarball. This can be used to bootstrap updates by
1348 # initializing the current "stock" tree to match the currently
1351 # Unlike 'update', this command does not rotate or preserve an
1352 # existing NEWTREE, it just replaces any existing tree.
1356 if [ $# -ne 0 ]; then
1360 log "extract command: tarball=$tarball"
1362 # Create a temporary directory to hold the tree
1363 dir=`mktemp -d $WORKDIR/etcupdate-XXXXXXX`
1364 if [ $? -ne 0 ]; then
1365 echo "Unable to create temporary directory."
1371 if [ -d $NEWTREE ]; then
1372 if ! remove_tree $NEWTREE; then
1373 echo "Unable to remove current tree."
1379 if ! mv $dir $NEWTREE >&3 2>&1; then
1380 echo "Unable to rename temp tree to current tree."
1386 # Resolve conflicts left from an earlier merge.
1391 if [ $# -ne 0 ]; then
1395 if ! [ -d $CONFLICTS ]; then
1399 if ! [ -d $NEWTREE ]; then
1400 echo "The current tree is not present to resolve conflicts."
1404 conflicts=`(cd $CONFLICTS; find . ! -type d) | sed -e 's/^\.//'`
1405 for file in $conflicts; do
1406 resolve_conflict $file
1409 if [ -n "$NEWALIAS_WARN" ]; then
1410 warn "Needs update: /etc/mail/aliases.db" \
1411 "(requires manual update via newaliases(1))"
1414 echo " Needs update: /etc/mail/aliases.db" \
1415 "(requires manual update via newaliases(1))"
1419 # Restore files to the stock version. Only files with a local change
1420 # are restored from the stock version.
1425 if [ $# -eq 0 ]; then
1432 if ! [ -e $NEWTREE/$file ]; then
1433 echo "File $file does not exist in the current tree."
1436 if [ -d $NEWTREE/$file ]; then
1437 echo "File $file is a directory."
1441 compare $DESTDIR/$file $NEWTREE/$file
1443 if [ $cmp -eq $COMPARE_EQUAL ]; then
1447 if update_unmodified $file; then
1448 # If this file had a conflict, clean up the
1450 if [ -e $CONFLICTS/$file ]; then
1451 if ! rm $CONFLICTS/$file >&3 2>&1; then
1452 echo "Failed to remove conflict " \
1460 # Report a summary of the previous merge. Specifically, list any
1461 # remaining conflicts followed by any warnings from the previous
1466 if [ $# -ne 0 ]; then
1470 if [ -d $CONFLICTS ]; then
1471 (cd $CONFLICTS; find . ! -type d) | sed -e 's/^\./ C /'
1473 if [ -s $WARNINGS ]; then
1479 # Perform an actual merge. The new tree can either already exist (if
1480 # rerunning a merge), be extracted from a tarball, or generated from a
1486 if [ $# -ne 0 ]; then
1490 log "update command: rerun=$rerun tarball=$tarball preworld=$preworld"
1492 if [ `id -u` -ne 0 ]; then
1493 echo "Must be root to update a tree."
1497 # Enforce a sane umask
1500 # XXX: Should existing conflicts be ignored and removed during
1503 # Trim the conflicts tree. Whine if there is anything left.
1504 if [ -e $CONFLICTS ]; then
1505 find -d $CONFLICTS -type d -empty -delete >&3 2>&1
1506 rmdir $CONFLICTS >&3 2>&1
1508 if [ -d $CONFLICTS ]; then
1509 echo "Conflicts remain from previous update, aborting."
1513 # Save tree names to use for rotation later.
1516 if [ -z "$rerun" ]; then
1517 # Extract the new tree to a temporary directory. The
1518 # trees are only rotated after a successful update to
1519 # avoid races if an update command is interrupted
1520 # before it completes.
1521 dir=`mktemp -d $WORKDIR/etcupdate-XXXXXXX`
1522 if [ $? -ne 0 ]; then
1523 echo "Unable to create temporary directory."
1527 # Populate the new tree.
1530 # Compare the new tree against the previous tree. For
1531 # the preworld case OLDTREE already points to the
1532 # current stock tree.
1533 if [ -z "$preworld" ]; then
1539 if ! [ -d $OLDTREE ]; then
1541 No previous tree to compare against, a sane comparison is not possible.
1543 log "No previous tree to compare against."
1544 if [ -n "$dir" ]; then
1545 if [ -n "$rerun" ]; then
1546 panic "Should not have a temporary directory"
1553 # Build lists of nodes in the old and new trees.
1554 (cd $OLDTREE; find .) | sed -e 's/^\.//' | sort > $WORKDIR/old.files
1555 (cd $NEWTREE; find .) | sed -e 's/^\.//' | sort > $WORKDIR/new.files
1557 # Split the files up into three groups using comm.
1558 comm -23 $WORKDIR/old.files $WORKDIR/new.files > $WORKDIR/removed.files
1559 comm -13 $WORKDIR/old.files $WORKDIR/new.files > $WORKDIR/added.files
1560 comm -12 $WORKDIR/old.files $WORKDIR/new.files > $WORKDIR/both.files
1562 # Initialize conflicts and warnings handling.
1566 # Ignore removed files for the pre-world case. A pre-world
1567 # update uses a stripped-down tree.
1568 if [ -n "$preworld" ]; then
1569 > $WORKDIR/removed.files
1572 # The order for the following sections is important. In the
1573 # odd case that a directory is converted into a file, the
1574 # existing subfiles need to be removed if possible before the
1575 # file is converted. Similarly, in the case that a file is
1576 # converted into a directory, the file needs to be converted
1577 # into a directory if possible before the new files are added.
1579 # First, handle removed files.
1580 for file in `cat $WORKDIR/removed.files`; do
1581 handle_removed_file $file
1584 # For the directory pass, reverse sort the list to effect a
1585 # depth-first traversal. This is needed to ensure that if a
1586 # directory with subdirectories is removed, the entire
1587 # directory is removed if there are no local modifications.
1588 for file in `sort -r $WORKDIR/removed.files`; do
1589 handle_removed_directory $file
1592 # Second, handle files that exist in both the old and new
1594 for file in `cat $WORKDIR/both.files`; do
1595 handle_modified_file $file
1598 # Finally, handle newly added files.
1599 for file in `cat $WORKDIR/added.files`; do
1600 handle_added_file $file
1603 if [ -n "$NEWALIAS_WARN" ]; then
1604 warn "Needs update: /etc/mail/aliases.db" \
1605 "(requires manual update via newaliases(1))"
1608 # Run any special one-off commands after an update has completed.
1611 if [ -s $WARNINGS ]; then
1616 # If this was a dryrun, remove the temporary tree if we built
1618 if [ -n "$dryrun" ]; then
1619 if [ -n "$dir" ]; then
1620 if [ -n "$rerun" ]; then
1621 panic "Should not have a temporary directory"
1628 # Finally, rotate any needed trees.
1629 if [ "$new" != "$NEWTREE" ]; then
1630 if [ -n "$rerun" ]; then
1631 panic "Should not have a temporary directory"
1633 if [ -z "$dir" ]; then
1634 panic "Should have a temporary directory"
1637 # Rotate the old tree if needed
1638 if [ "$old" != "$OLDTREE" ]; then
1639 if [ -n "$preworld" ]; then
1640 panic "Old tree should be unchanged"
1643 if ! remove_tree $old; then
1644 echo "Unable to remove previous old tree."
1648 if ! mv $OLDTREE $old >&3 2>&1; then
1649 echo "Unable to rename old tree."
1654 # Rotate the new tree. Remove a previous pre-world
1655 # tree if it exists.
1656 if [ -d $new ]; then
1657 if [ -z "$preworld" ]; then
1658 panic "New tree should be rotated to old"
1660 if ! remove_tree $new; then
1661 echo "Unable to remove previous pre-world tree."
1666 if ! mv $NEWTREE $new >&3 2>&1; then
1667 echo "Unable to rename current tree."
1673 # Determine which command we are executing. A command may be
1674 # specified as the first word. If one is not specified then 'update'
1675 # is assumed as the default command.
1677 if [ $# -gt 0 ]; then
1679 build|diff|extract|status|resolve|revert)
1684 # If first arg is an option, assume the
1693 # Set default variable values.
1695 # The path to the source tree used to build trees.
1698 # The destination directory where the modified files live.
1701 # Ignore changes in the FreeBSD ID string.
1704 # Files that should always have the new version of the file installed.
1707 # Files to ignore and never update during a merge.
1710 # Flags to pass to 'make' when building a tree.
1713 # Include a config file if it exists. Note that command line options
1714 # override any settings in the config file. More details are in the
1715 # manual, but in general the following variables can be set:
1725 if [ -r /etc/etcupdate.conf ]; then
1726 . /etc/etcupdate.conf
1729 # Parse command line options
1737 while getopts "d:nprs:t:A:BD:FI:L:M:" option; do
1758 # To allow this option to be specified
1759 # multiple times, accumulate command-line
1760 # specified patterns in an 'always' variable
1761 # and use that to overwrite ALWAYS_INSTALL
1762 # after parsing all options. Need to be
1763 # careful here with globbing expansion.
1765 always="$always $OPTARG"
1778 # To allow this option to be specified
1779 # multiple times, accumulate command-line
1780 # specified patterns in an 'ignore' variable
1781 # and use that to overwrite IGNORE_FILES after
1782 # parsing all options. Need to be careful
1783 # here with globbing expansion.
1785 ignore="$ignore $OPTARG"
1792 MAKE_OPTIONS="$OPTARG"
1800 shift $((OPTIND - 1))
1802 # Allow -A command line options to override ALWAYS_INSTALL set from
1805 if [ -n "$always" ]; then
1806 ALWAYS_INSTALL="$always"
1809 # Allow -I command line options to override IGNORE_FILES set from the
1811 if [ -n "$ignore" ]; then
1812 IGNORE_FILES="$ignore"
1816 # Where the "old" and "new" trees are stored.
1817 WORKDIR=${WORKDIR:-$DESTDIR/var/db/etcupdate}
1819 # Log file for verbose output from program that are run. The log file
1820 # is opened on fd '3'.
1821 LOGFILE=${LOGFILE:-$WORKDIR/log}
1823 # The path of the "old" tree
1824 OLDTREE=$WORKDIR/old
1826 # The path of the "new" tree
1827 NEWTREE=$WORKDIR/current
1829 # The path of the "conflicts" tree where files with merge conflicts are saved.
1830 CONFLICTS=$WORKDIR/conflicts
1832 # The path of the "warnings" file that accumulates warning notes from an update.
1833 WARNINGS=$WORKDIR/warnings
1835 # Use $EDITOR for resolving conflicts. If it is not set, default to vi.
1836 EDITOR=${EDITOR:-/usr/bin/vi}
1838 # Files that need to be updated before installworld.
1839 PREWORLD_FILES="etc/master.passwd etc/group"
1841 # Handle command-specific argument processing such as complaining
1842 # about unsupported options. Since the configuration file is always
1843 # included, do not complain about extra command line arguments that
1844 # may have been set via the config file rather than the command line.
1847 if [ -n "$rerun" -a -n "$tarball" ]; then
1848 echo "Only one of -r or -t can be specified."
1852 if [ -n "$rerun" -a -n "$preworld" ]; then
1853 echo "Only one of -p or -r can be specified."
1858 build|diff|status|revert)
1859 if [ -n "$dryrun" -o -n "$rerun" -o -n "$tarball" -o \
1860 -n "$preworld" ]; then
1865 if [ -n "$dryrun" -o -n "$rerun" -o -n "$tarball" ]; then
1870 if [ -n "$dryrun" -o -n "$rerun" -o -n "$preworld" ]; then
1876 # Pre-world mode uses a different set of trees. It leaves the current
1877 # tree as-is so it is still present for a full etcupdate run after the
1878 # world install is complete. Instead, it installs a few critical files
1879 # into a separate tree.
1880 if [ -n "$preworld" ]; then
1882 NEWTREE=$WORKDIR/preworld
1885 # Open the log file. Don't truncate it if doing a minor operation so
1886 # that a minor operation doesn't lose log info from a major operation.
1887 if ! mkdir -p $WORKDIR 2>/dev/null; then
1888 echo "Failed to create work directory $WORKDIR"
1892 diff|resolve|revert|status)