5 # Compare files created by /usr/src/etc/Makefile (or the directory
6 # the user specifies) with the currently installed copies.
8 # Copyright 1998-2009 Douglas Barton
13 PATH=/bin:/usr/bin:/usr/sbin
16 VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`
17 echo "mergemaster version ${VERSION_NUMBER}"
18 echo 'Usage: mergemaster [-scrvahipFCPU]'
19 echo ' [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]'
21 echo " -s Strict comparison (diff every pair of files)"
22 echo " -c Use context diff instead of unified diff"
23 echo " -r Re-run on a previously cleaned directory (skip temproot creation)"
24 echo " -v Be more verbose about the process, include additional checks"
25 echo " -a Leave all files that differ to merge by hand"
26 echo " -h Display more complete help"
27 echo ' -i Automatically install files that do not exist in destination directory'
28 echo ' -p Pre-buildworld mode, only compares crucial files'
29 echo ' -F Install files that differ only by revision control Id ($FreeBSD)'
30 echo ' -C Compare local rc.conf variables to the defaults'
31 echo ' -P Preserve files that are overwritten'
32 echo " -U Attempt to auto upgrade files that have not been user modified"
34 echo " -m /path/directory Specify location of source to do the make in"
35 echo " -t /path/directory Specify temp root directory"
36 echo " -d Add date and time to directory name (e.g., /var/tmp/temproot.`date +%m%d.%H.%M`)"
37 echo " -u N Specify a numeric umask"
38 echo " -w N Specify a screen width in columns to sdiff"
39 echo " -A architecture Alternative architecture name to pass to make"
40 echo ' -D /path/directory Specify the destination directory to install files to'
45 echo "* To specify a directory other than /var/tmp/temproot for the"
46 echo " temporary root environment, use -t /path/to/temp/root"
47 echo "* The -w option takes a number as an argument for the column width"
48 echo " of the screen. The default is 80."
49 echo '* The -a option causes mergemaster to run without prompting.'
52 # Loop allowing the user to use sdiff to merge files and display the merged
58 echo " *** Type h at the sdiff prompt (%) to get usage help"
63 while [ "${MERGE_AGAIN}" = "yes" ]; do
64 # Prime file.merged so we don't blat the owner/group id's
65 cp -p "${COMPFILE}" "${COMPFILE}.merged"
66 sdiff -o "${COMPFILE}.merged" --text --suppress-common-lines \
67 --width=${SCREEN_WIDTH:-80} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}"
69 while [ "${INSTALL_MERGED}" = "v" -o "${INSTALL_MERGED}" = "V" ]; do
71 echo " Use 'i' to install merged file"
72 echo " Use 'r' to re-do the merge"
73 echo " Use 'v' to view the merged file"
74 echo " Default is to leave the temporary file to deal with by hand"
76 echo -n " *** How should I deal with the merged file? [Leave it for later] "
79 case "${INSTALL_MERGED}" in
81 mv "${COMPFILE}.merged" "${COMPFILE}"
83 if mm_install "${COMPFILE}"; then
84 echo " *** Merged version of ${COMPFILE} installed successfully"
86 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand later"
91 rm "${COMPFILE}.merged"
94 ${PAGER} "${COMPFILE}.merged"
97 echo " *** ${COMPFILE} will remain for your consideration"
101 echo "invalid choice: ${INSTALL_MERGED}"
109 # Loop showing user differences between files, allow merge, skip or install
115 while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o \
116 "${HANDLE_COMPFILE}" = "NOT V" ]; do
117 if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then
118 if [ -n "${AUTO_UPGRADE}" -a -n "${CHANGED}" ]; then
120 *:${DESTDIR}${COMPFILE#.}:*) ;; # File has been modified
123 echo " *** ${COMPFILE} has not been user modified."
126 if mm_install "${COMPFILE}"; then
127 echo " *** ${COMPFILE} upgraded successfully"
129 # Make the list print one file per line
130 AUTO_UPGRADED_FILES="${AUTO_UPGRADED_FILES} ${DESTDIR}${COMPFILE#.}
133 echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand"
139 if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then
141 echo ' ====================================================================== '
144 echo " *** Displaying differences between ${COMPFILE} and installed version:"
146 diff ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}"
152 echo " *** There is no installed version of ${COMPFILE}"
154 case "${AUTO_INSTALL}" in
157 if mm_install "${COMPFILE}"; then
158 echo " *** ${COMPFILE} installed successfully"
160 # Make the list print one file per line
161 AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES} ${DESTDIR}${COMPFILE#.}
164 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand"
174 echo " Use 'd' to delete the temporary ${COMPFILE}"
175 echo " Use 'i' to install the temporary ${COMPFILE}"
176 case "${NO_INSTALLED}" in
178 echo " Use 'm' to merge the temporary and installed versions"
179 echo " Use 'v' to view the diff results again"
183 echo " Default is to leave the temporary file to deal with by hand"
185 echo -n "How should I deal with this? [Leave it for later] "
188 case "${HANDLE_COMPFILE}" in
192 echo " *** Deleting ${COMPFILE}"
196 if mm_install "${COMPFILE}"; then
197 echo " *** ${COMPFILE} installed successfully"
199 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand"
203 case "${NO_INSTALLED}" in
205 # interact with user to merge files
210 echo " *** There is no installed version of ${COMPFILE}"
212 HANDLE_COMPFILE="NOT V"
214 esac # End of "No installed version of file but user selected merge" test
221 echo " *** ${COMPFILE} will remain for your consideration"
224 # invalid choice, show menu again.
225 echo "invalid choice: ${HANDLE_COMPFILE}"
227 HANDLE_COMPFILE="NOT V"
230 esac # End of "How to handle files that are different"
242 press_to_continue () {
244 echo -n ' *** Press the [Enter] or [Return] key to continue '
248 # Set the default path for the temporary root environment
250 TEMPROOT='/var/tmp/temproot'
252 # Read /etc/mergemaster.rc first so the one in $HOME can override
254 if [ -r /etc/mergemaster.rc ]; then
255 . /etc/mergemaster.rc
258 # Read .mergemasterrc before command line so CLI can override
260 if [ -r "$HOME/.mergemasterrc" ]; then
261 . "$HOME/.mergemasterrc"
264 # Assign the location of the mtree database
266 MTREEDB=${MTREEDB:-/var/db}
267 MTREEFILE="${MTREEDB}/mergemaster.mtree"
269 # Check the command line options
271 while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do
272 case "${COMMAND_LINE_ARGUMENT}" in
274 ARCHSTRING='TARGET_ARCH='${OPTARG}
293 case "${AUTO_RUN}" in
327 TEMPROOT=${TEMPROOT}.`date +%m%d.%H.%M`
333 SCREEN_WIDTH=${OPTARG}
345 # Don't force the user to set this in the mergemaster rc file
346 if [ -n "${PRESERVE_FILES}" -a -z "${PRESERVE_FILES_DIR}" ]; then
347 PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S`
350 # Check for the mtree database in DESTDIR
351 case "${AUTO_UPGRADE}" in
352 '') ;; # If the option is not set no need to run the test or warn the user
354 if [ ! -s "${DESTDIR}${MTREEFILE}" ]; then
356 echo "*** Unable to find mtree database. Skipping auto-upgrade on this run."
357 echo " It will be created for the next run when this one is complete."
365 if [ -e "${DESTDIR}/etc/fstab" ]; then
366 if grep -q nodev ${DESTDIR}/etc/fstab; then
368 echo "*** You have the deprecated 'nodev' option in ${DESTDIR}/etc/fstab."
369 echo " This can prevent the filesystem from being mounted on reboot."
370 echo " Please update your fstab before continuing."
371 echo " See fstab(5) for more information."
379 # If the user has a pager defined, make sure we can run it
381 case "${DONT_CHECK_PAGER}" in
384 while ! type "${PAGER%% *}" >/dev/null; do
385 echo " *** Your PAGER environment variable specifies '${PAGER}', but"
386 echo " due to the limited PATH that I use for security reasons,"
387 echo " I cannot execute it. So, what would you like to do?"
389 echo " Use 'e' to exit mergemaster and fix your PAGER variable"
390 if [ -x /usr/bin/less -o -x /usr/local/bin/less ]; then
391 echo " Use 'l' to set PAGER to 'less' for this run"
393 echo " Use 'm' to use plain old 'more' as your PAGER for this run"
395 echo " Default is to use plain old 'more' "
397 echo -n "What should I do? [Use 'more'] "
400 case "${FIXPAGER}" in
405 if [ -x /usr/bin/less ]; then
407 elif [ -x /usr/local/bin/less ]; then
408 PAGER=/usr/local/bin/less
411 echo " *** Fatal Error:"
412 echo " You asked to use 'less' as your pager, but I can't"
413 echo " find it in /usr/bin or /usr/local/bin"
422 echo "invalid choice: ${FIXPAGER}"
427 if [ -n "${PAGER}" ]; then
433 # If user has a pager defined, or got assigned one above, use it.
438 if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then
439 echo " *** You have ${PAGER} defined as your pager so we will use that"
444 # Assign the diff flag once so we will not have to keep testing it
446 DIFF_FLAG=${DIFF_FLAG:--u}
448 # Assign the source directory
450 SOURCEDIR=${SOURCEDIR:-/usr/src}
451 if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \
452 -f ${SOURCEDIR}/../Makefile.inc1 ]; then
453 echo " *** The source directory you specified (${SOURCEDIR})"
454 echo " will be reset to ${SOURCEDIR}/.."
457 SOURCEDIR=${SOURCEDIR}/..
460 # Setup make to use system files from SOURCEDIR
461 MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk"
463 # Check DESTDIR against the mergemaster mtree database to see what
464 # files the user changed from the reference files.
466 if [ -n "${AUTO_UPGRADE}" -a -s "${DESTDIR}${MTREEFILE}" ]; then
468 for file in `mtree -eqL -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
469 2>/dev/null | awk '($2 == "changed") {print $1}'`; do
470 if [ -f "${DESTDIR}/$file" ]; then
471 CHANGED="${CHANGED}${DESTDIR}/${file}:"
474 [ "$CHANGED" = ':' ] && unset CHANGED
477 # Check the width of the user's terminal
482 0|'') ;; # No-op, since the input is not valid
484 case "${SCREEN_WIDTH}" in
485 '') SCREEN_WIDTH="${w}" ;;
486 "${w}") ;; # No-op, since they are the same
488 echo -n "*** You entered ${SCREEN_WIDTH} as your screen width, but stty "
489 echo "thinks it is ${w}."
491 echo -n "What would you like to use? [${w}] "
493 case "${SCREEN_WIDTH}" in
494 '') SCREEN_WIDTH="${w}" ;;
501 # Define what CVS $Id tag to look for to aid portability.
506 rm -rf "${TEMPROOT}" 2>/dev/null
507 chflags -R 0 "${TEMPROOT}" 2>/dev/null
508 rm -rf "${TEMPROOT}" || exit 1
513 # Set up the loop to test for the existence of the
514 # temp root directory.
517 while [ "${TEST_TEMP_ROOT}" = "yes" ]; do
518 if [ -d "${TEMPROOT}" ]; then
519 echo "*** The directory specified for the temporary root environment,"
520 echo " ${TEMPROOT}, exists. This can be a security risk if untrusted"
521 echo " users have access to the system."
523 case "${AUTO_RUN}" in
525 echo " Use 'd' to delete the old ${TEMPROOT} and continue"
526 echo " Use 't' to select a new temporary root directory"
527 echo " Use 'e' to exit mergemaster"
529 echo " Default is to use ${TEMPROOT} as is"
531 echo -n "How should I deal with this? [Use the existing ${TEMPROOT}] "
534 case "${DELORNOT}" in
537 echo " *** Deleting the old ${TEMPROOT}"
539 delete_temproot || exit 1
543 echo " *** Enter new directory name for temporary root environment"
551 echo " *** Leaving ${TEMPROOT} intact"
557 echo "invalid choice: ${DELORNOT}"
563 # If this is an auto-run, try a hopefully safe alternative then
565 TEMPROOT=/var/tmp/temproot.`date +%m%d.%H.%M.%S`
573 echo "*** Creating the temporary root environment in ${TEMPROOT}"
575 if mkdir -p "${TEMPROOT}"; then
576 echo " *** ${TEMPROOT} ready for use"
579 if [ ! -d "${TEMPROOT}" ]; then
581 echo " *** FATAL ERROR: Cannot create ${TEMPROOT}"
586 echo " *** Creating and populating directory structure in ${TEMPROOT}"
596 case "${PRE_WORLD}" in
602 ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs
605 od=${TEMPROOT}/usr/obj
606 ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs &&
607 MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
608 MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
609 MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
611 echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
612 echo " the temproot environment";
617 # Only set up files that are crucial to {build|install}world
618 { mkdir -p ${TEMPROOT}/etc &&
619 cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc &&
620 cp -p ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} ||
622 echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
628 # Doing the inventory and removing files that we don't want to compare only
629 # makes sense if we are not doing a rerun, since we have no way of knowing
630 # what happened to the files during previous incarnations.
635 echo ' *** The following files exist only in the installed version of'
636 echo " ${DESTDIR}/etc. In the vast majority of cases these files"
637 echo ' are necessary parts of the system and should not be deleted.'
638 echo ' However because these files are not updated by this process you'
639 echo ' might want to verify their status before rebooting your system.'
642 diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER}
648 # Avoid comparing the motd if the user specifies it in .mergemasterrc
649 # Compatibility shim to be removed in FreeBSD 9.x
650 case "${IGNORE_MOTD}" in
652 *) IGNORE_FILES="${IGNORE_FILES} /etc/motd"
654 echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file."
655 echo " This option is deprecated in favor of the IGNORE_FILES option."
656 echo " Please update your rc file accordingly."
662 # Avoid comparing the following user specified files
663 for file in ${IGNORE_FILES}; do
664 test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file}
666 ;; # End of the "RERUN" test
669 # We really don't want to have to deal with files like login.conf.db, pwd.db,
670 # or spwd.db. Instead, we want to compare the text versions, and run *_mkdb.
671 # Prompt the user to do so below, as needed.
673 rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd
675 # We only need to compare things like freebsd.cf once
676 find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null
678 # Delete stuff we do not need to keep the mtree database small,
679 # and to make the actual comparison faster.
680 find ${TEMPROOT}/usr -type l -delete 2>/dev/null
681 find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null
682 find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null
684 # Build the mtree database in a temporary location.
685 MTREENEW=`mktemp -t mergemaster.mtree`
686 case "${PRE_WORLD}" in
687 '') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
689 *) # We don't want to mess with the mtree database on a pre-world run.
693 # Get ready to start comparing files
695 # Check umask if not specified on the command line,
696 # and we are not doing an autorun
698 if [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN}" ]; then
700 case "${USER_UMASK}" in
704 echo " *** Your umask is currently set to ${USER_UMASK}. By default, this script"
705 echo " installs all files with the same user, group and modes that"
706 echo " they are created with by ${SOURCEDIR}/etc/Makefile, compared to"
707 echo " a umask of 022. This umask allows world read permission when"
708 echo " the file's default permissions have it."
710 echo " No world permissions can sometimes cause problems. A umask of"
711 echo " 022 will restore the default behavior, but is not mandatory."
712 echo " /etc/master.passwd is a special case. Its file permissions"
713 echo " will be 600 (rw-------) if installed."
715 echo -n "What umask should I use? [${USER_UMASK}] "
718 NEW_UMASK="${NEW_UMASK:-$USER_UMASK}"
724 CONFIRMED_UMASK=${NEW_UMASK:-0022}
727 # Warn users who still have old rc files
729 for file in atm devfs diskless1 diskless2 network network6 pccard \
730 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do
731 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then
737 case "${OLD_RC_PRESENT}" in
740 echo " *** There are elements of the old rc system in ${DESTDIR}/etc/."
742 echo ' While these scripts will not hurt anything, they are not'
743 echo ' functional on an up to date system, and can be removed.'
746 case "${AUTO_RUN}" in
748 echo -n 'Move these files to /var/tmp/mergemaster/old_rc? [yes] '
751 case "${MOVE_OLD_RC}" in
754 mkdir -p /var/tmp/mergemaster/old_rc
755 for file in atm devfs diskless1 diskless2 network network6 pccard \
756 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do
757 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then
758 mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/
761 echo ' The files have been moved'
770 # Use the umask/mode information to install the files
771 # Create directories as needed
774 echo "*** FATAL ERROR: Unable to install ${1} to ${2}"
779 do_install_and_rm () {
780 case "${PRESERVE_FILES}" in
782 if [ -f "${3}/${2##*/}" ]; then
783 mkdir -p ${PRESERVE_FILES_DIR}/${2%/*}
784 cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*}
789 if [ ! -d "${3}/${2##*/}" ]; then
790 if install -m ${1} ${2} ${3}; then
793 install_error ${2} ${3}
796 install_error ${2} ${3}
800 # 4095 = "obase=10;ibase=8;07777" | bc
803 OCTAL=$(( ~$(echo "obase=10; ibase=8; ${CONFIRMED_UMASK}" | bc) & 4095 &
804 $(echo "obase=10; ibase=8; $(stat -f "%OMp%OLp" ${1})" | bc) ))
805 printf "%04o\n" ${OCTAL}
811 INSTALL_DIR=${INSTALL_DIR%/*}
813 case "${INSTALL_DIR}" in
819 if [ -n "${DESTDIR}${INSTALL_DIR}" -a ! -d "${DESTDIR}${INSTALL_DIR}" ]; then
820 DIR_MODE=`find_mode "${TEMPROOT}/${INSTALL_DIR}"`
821 install -d -o root -g wheel -m "${DIR_MODE}" "${DESTDIR}${INSTALL_DIR}"
824 FILE_MODE=`find_mode "${1}"`
826 if [ ! -x "${1}" ]; then
835 do_install_and_rm 600 "${1}" "${DESTDIR}${INSTALL_DIR}"
840 case "${AUTO_INSTALL}" in
842 case "${LINK_EXPLAINED}" in
844 echo " *** Historically BSD derived systems have had a"
845 echo " hard link from /.cshrc and /.profile to"
846 echo " their namesakes in /root. Please indicate"
847 echo " your preference below for bringing your"
848 echo " installed files up to date."
854 echo " Use 'd' to delete the temporary ${COMPFILE}"
855 echo " Use 'l' to delete the existing ${DESTDIR}${COMPFILE#.} and create the link"
857 echo " Default is to leave the temporary file to deal with by hand"
859 echo -n " How should I handle ${COMPFILE}? [Leave it to install later] "
862 *) # Part of AUTO_INSTALL
867 case "${HANDLE_LINK}" in
871 echo " *** Deleting ${COMPFILE}"
875 rm -f "${DESTDIR}${COMPFILE#.}"
876 if ln "${DESTDIR}/root/${COMPFILE##*/}" "${DESTDIR}${COMPFILE#.}"; then
877 echo " *** Link from ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/} installed successfully"
880 echo " *** Error linking ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/}, ${COMPFILE} will remain to install by hand"
884 echo " *** ${COMPFILE} will remain for your consideration"
891 case "${DONT_INSTALL}" in
893 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}"
899 else # File matched -x
900 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}"
905 if [ ! -d "${TEMPROOT}" ]; then
906 echo "*** FATAL ERROR: The temproot directory (${TEMPROOT})"
907 echo ' has disappeared!'
913 echo "*** Beginning comparison"
916 # Pre-world does not populate /etc/rc.d.
917 # It is very possible that a previous run would have deleted files in
918 # ${TEMPROOT}/etc/rc.d, thus creating a lot of false positives.
919 if [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then
920 echo " *** Checking ${DESTDIR}/etc/rc.d for stale files"
922 cd "${DESTDIR}/etc/rc.d" &&
924 if [ ! -e "${TEMPROOT}/etc/rc.d/${file}" ]; then
925 STALE_RC_FILES="${STALE_RC_FILES} ${file}"
928 case "${STALE_RC_FILES}" in
930 echo ' *** No stale files found'
933 echo " *** The following files exist in ${DESTDIR}/etc/rc.d but not in"
934 echo " ${TEMPROOT}/etc/rc.d/:"
936 echo "${STALE_RC_FILES}"
938 echo ' The presence of stale files in this directory can cause the'
939 echo ' dreaded unpredictable results, and therefore it is highly'
940 echo ' recommended that you delete them.'
941 case "${AUTO_RUN}" in
944 echo -n ' *** Delete them now? [n] '
945 read DELETE_STALE_RC_FILES
946 case "${DELETE_STALE_RC_FILES}" in
948 echo ' *** Deleting ... '
953 echo ' *** Files will not be deleted'
966 if [ -r "${MM_PRE_COMPARE_SCRIPT}" ]; then
967 . "${MM_PRE_COMPARE_SCRIPT}"
970 for COMPFILE in `find . -type f`; do
972 # First, check to see if the file exists in DESTDIR. If not, the
973 # diff_loop function knows how to handle it.
975 if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then
976 case "${AUTO_RUN}" in
981 case "${AUTO_INSTALL}" in
983 # If this is an auto run, make it official
984 echo " *** ${COMPFILE} will remain for your consideration"
997 # Compare CVS $Id's first so if the file hasn't been modified
998 # local changes will be ignored.
999 # If the files have the same $Id, delete the one in temproot so the
1000 # user will have less to wade through if files are left to merge by hand.
1002 CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null`
1003 CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID2=none
1007 echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting"
1014 # If the file is still here either because the $Ids are different, the
1015 # file doesn't have an $Id, or we're using STRICT mode; look at the diff.
1017 if [ -f "${COMPFILE}" ]; then
1019 # Do an absolute diff first to see if the files are actually different.
1020 # If they're not different, delete the one in temproot.
1022 if diff -q ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \
1023 /dev/null 2>&1; then
1024 echo " *** Temp ${COMPFILE} and installed are the same, deleting"
1027 # Ok, the files are different, so show the user where they differ.
1028 # Use user's choice of diff methods; and user's pager if they have one.
1030 # Use unified diffs by default. Context diffs give me a headache. :)
1032 # If the user chose the -F option, test for that before proceeding
1034 if [ -n "$FREEBSD_ID" ]; then
1035 if diff -q -I'[$]FreeBSD:.*$' "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \
1036 /dev/null 2>&1; then
1037 if mm_install "${COMPFILE}"; then
1038 echo "*** Updated revision control Id for ${DESTDIR}${COMPFILE#.}"
1040 echo "*** Problem installing ${COMPFILE}, it will remain to merge by hand later"
1045 case "${AUTO_RUN}" in
1047 # prompt user to install/delete/merge changes
1051 # If this is an auto run, make it official
1052 echo " *** ${COMPFILE} will remain for your consideration"
1054 esac # Auto run test
1055 fi # Yes, the files are different
1056 fi # Yes, the file still remains to be checked
1057 done # This is for the for way up there at the beginning of the comparison
1060 echo "*** Comparison complete"
1062 if [ -s "${MTREENEW}" ]; then
1063 echo "*** Saving mtree database for future upgrades"
1064 test -e "${DESTDIR}${MTREEFILE}" && unlink ${DESTDIR}${MTREEFILE}
1065 mv ${MTREENEW} ${DESTDIR}${MTREEFILE}
1070 TEST_FOR_FILES=`find ${TEMPROOT} -type f -size +0 2>/dev/null`
1071 if [ -n "${TEST_FOR_FILES}" ]; then
1072 echo "*** Files that remain for you to merge by hand:"
1073 find "${TEMPROOT}" -type f -size +0
1077 case "${AUTO_RUN}" in
1079 echo -n "Do you wish to delete what is left of ${TEMPROOT}? [no] "
1082 case "${DEL_TEMPROOT}" in
1084 if delete_temproot; then
1085 echo " *** ${TEMPROOT} has been deleted"
1087 echo " *** Unable to delete ${TEMPROOT}"
1091 echo " *** ${TEMPROOT} will remain"
1098 case "${AUTO_INSTALLED_FILES}" in
1101 case "${AUTO_RUN}" in
1105 echo '*** You chose the automatic install option for files that did not'
1106 echo ' exist on your system. The following were installed for you:'
1107 echo "${AUTO_INSTALLED_FILES}"
1112 echo '*** You chose the automatic install option for files that did not'
1113 echo ' exist on your system. The following were installed for you:'
1114 echo "${AUTO_INSTALLED_FILES}"
1120 case "${AUTO_UPGRADED_FILES}" in
1123 case "${AUTO_RUN}" in
1127 echo '*** You chose the automatic upgrade option for files that you did'
1128 echo ' not alter on your system. The following were upgraded for you:'
1129 echo "${AUTO_UPGRADED_FILES}"
1134 echo '*** You chose the automatic upgrade option for files that you did'
1135 echo ' not alter on your system. The following were upgraded for you:'
1136 echo "${AUTO_UPGRADED_FILES}"
1143 case "${AUTO_RUN}" in
1147 echo -n ' Would you like to run it now? y or n [n] '
1150 case "${YES_OR_NO}" in
1152 echo " Running ${1}"
1158 echo " *** Cancelled"
1160 echo " Make sure to run ${1} yourself"
1164 echo " *** Sorry, I do not understand your answer (${YES_OR_NO})"
1166 echo " Make sure to run ${1} yourself"
1173 case "${NEED_NEWALIASES}" in
1177 if [ -n "${DESTDIR}" ]; then
1178 echo "*** You installed a new aliases file into ${DESTDIR}/etc/mail, but"
1179 echo " the newaliases command is limited to the directories configured"
1180 echo " in sendmail.cf. Make sure to create your aliases database by"
1181 echo " hand when your sendmail configuration is done."
1183 echo "*** You installed a new aliases file, so make sure that you run"
1184 echo " '/usr/bin/newaliases' to rebuild your aliases database"
1185 run_it_now '/usr/bin/newaliases'
1190 case "${NEED_CAP_MKDB}" in
1194 echo "*** You installed a login.conf file, so make sure that you run"
1195 echo " '/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf'"
1196 echo " to rebuild your login.conf database"
1197 run_it_now "/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf"
1201 case "${NEED_PWD_MKDB}" in
1205 echo "*** You installed a new master.passwd file, so make sure that you run"
1206 if [ -n "${DESTDIR}" ]; then
1207 echo " '/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd'"
1208 echo " to rebuild your password files"
1209 run_it_now "/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd"
1211 echo " '/usr/sbin/pwd_mkdb -p /etc/master.passwd'"
1212 echo " to rebuild your password files"
1213 run_it_now '/usr/sbin/pwd_mkdb -p /etc/master.passwd'
1220 if [ -r "${MM_EXIT_SCRIPT}" ]; then
1221 . "${MM_EXIT_SCRIPT}"
1224 case "${COMP_CONFS}" in
1227 . ${DESTDIR}/etc/defaults/rc.conf
1230 echo "*** Comparing conf files: ${rc_conf_files}"
1232 for CONF_FILE in ${rc_conf_files}; do
1233 if [ -r "${DESTDIR}${CONF_FILE}" ]; then
1235 echo "*** From ${DESTDIR}${CONF_FILE}"
1236 echo "*** From ${DESTDIR}/etc/defaults/rc.conf"
1238 for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} |
1239 cut -d '=' -f 1`; do
1241 grep -w ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE}
1242 grep -w ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf ||
1243 echo ' * No default variable with this name'
1251 case "${PRE_WORLD}" in
1254 MAKE_CONF="${SOURCEDIR}/share/examples/etc/make.conf"
1257 echo '*** Comparing make variables'
1259 echo "*** From ${DESTDIR}/etc/make.conf"
1260 echo "*** From ${MAKE_CONF}"
1262 for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`; do
1264 grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf
1265 grep -w ^#${MAKE_VAR} ${MAKE_CONF} ||
1266 echo ' * No example variable with this name'