mergemaster.sh revision 201291
1#!/bin/sh 2 3# mergemaster 4 5# Compare files created by /usr/src/etc/Makefile (or the directory 6# the user specifies) with the currently installed copies. 7 8# Copyright 1998-2009 Douglas Barton 9# DougB@FreeBSD.org 10 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 201291 2009-12-30 23:14:03Z dougb $ 12 13PATH=/bin:/usr/bin:/usr/sbin 14 15display_usage () { 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]' 20 echo "Options:" 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" 33 echo '' 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' 41 echo '' 42} 43 44display_help () { 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.' 50} 51 52# Loop allowing the user to use sdiff to merge files and display the merged 53# file. 54merge_loop () { 55 case "${VERBOSE}" in 56 '') ;; 57 *) 58 echo " *** Type h at the sdiff prompt (%) to get usage help" 59 ;; 60 esac 61 echo '' 62 MERGE_AGAIN=yes 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}" 68 INSTALL_MERGED=V 69 while [ "${INSTALL_MERGED}" = "v" -o "${INSTALL_MERGED}" = "V" ]; do 70 echo '' 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" 75 echo '' 76 echo -n " *** How should I deal with the merged file? [Leave it for later] " 77 read INSTALL_MERGED 78 79 case "${INSTALL_MERGED}" in 80 [iI]) 81 mv "${COMPFILE}.merged" "${COMPFILE}" 82 echo '' 83 if mm_install "${COMPFILE}"; then 84 echo " *** Merged version of ${COMPFILE} installed successfully" 85 else 86 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand later" 87 fi 88 unset MERGE_AGAIN 89 ;; 90 [rR]) 91 rm "${COMPFILE}.merged" 92 ;; 93 [vV]) 94 ${PAGER} "${COMPFILE}.merged" 95 ;; 96 '') 97 echo " *** ${COMPFILE} will remain for your consideration" 98 unset MERGE_AGAIN 99 ;; 100 *) 101 echo "invalid choice: ${INSTALL_MERGED}" 102 INSTALL_MERGED=V 103 ;; 104 esac 105 done 106 done 107} 108 109# Loop showing user differences between files, allow merge, skip or install 110# options 111diff_loop () { 112 113 HANDLE_COMPFILE=v 114 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 119 case "${CHANGED}" in 120 *:${DESTDIR}${COMPFILE#.}:*) ;; # File has been modified 121 *) 122 echo '' 123 echo " *** ${COMPFILE} has not been user modified." 124 echo '' 125 126 if mm_install "${COMPFILE}"; then 127 echo " *** ${COMPFILE} upgraded successfully" 128 echo '' 129 # Make the list print one file per line 130 AUTO_UPGRADED_FILES="${AUTO_UPGRADED_FILES} ${DESTDIR}${COMPFILE#.} 131" 132 else 133 echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" 134 fi 135 return 136 ;; 137 esac 138 fi 139 if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then 140 echo '' 141 echo ' ====================================================================== ' 142 echo '' 143 ( 144 echo " *** Displaying differences between ${COMPFILE} and installed version:" 145 echo '' 146 diff ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" 147 ) | ${PAGER} 148 echo '' 149 fi 150 else 151 echo '' 152 echo " *** There is no installed version of ${COMPFILE}" 153 echo '' 154 case "${AUTO_INSTALL}" in 155 [Yy][Ee][Ss]) 156 echo '' 157 if mm_install "${COMPFILE}"; then 158 echo " *** ${COMPFILE} installed successfully" 159 echo '' 160 # Make the list print one file per line 161 AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES} ${DESTDIR}${COMPFILE#.} 162" 163 else 164 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand" 165 fi 166 return 167 ;; 168 *) 169 NO_INSTALLED=yes 170 ;; 171 esac 172 fi 173 174 echo " Use 'd' to delete the temporary ${COMPFILE}" 175 echo " Use 'i' to install the temporary ${COMPFILE}" 176 case "${NO_INSTALLED}" in 177 '') 178 echo " Use 'm' to merge the temporary and installed versions" 179 echo " Use 'v' to view the diff results again" 180 ;; 181 esac 182 echo '' 183 echo " Default is to leave the temporary file to deal with by hand" 184 echo '' 185 echo -n "How should I deal with this? [Leave it for later] " 186 read HANDLE_COMPFILE 187 188 case "${HANDLE_COMPFILE}" in 189 [dD]) 190 rm "${COMPFILE}" 191 echo '' 192 echo " *** Deleting ${COMPFILE}" 193 ;; 194 [iI]) 195 echo '' 196 if mm_install "${COMPFILE}"; then 197 echo " *** ${COMPFILE} installed successfully" 198 else 199 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand" 200 fi 201 ;; 202 [mM]) 203 case "${NO_INSTALLED}" in 204 '') 205 # interact with user to merge files 206 merge_loop 207 ;; 208 *) 209 echo '' 210 echo " *** There is no installed version of ${COMPFILE}" 211 echo '' 212 HANDLE_COMPFILE="NOT V" 213 ;; 214 esac # End of "No installed version of file but user selected merge" test 215 ;; 216 [vV]) 217 continue 218 ;; 219 '') 220 echo '' 221 echo " *** ${COMPFILE} will remain for your consideration" 222 ;; 223 *) 224 # invalid choice, show menu again. 225 echo "invalid choice: ${HANDLE_COMPFILE}" 226 echo '' 227 HANDLE_COMPFILE="NOT V" 228 continue 229 ;; 230 esac # End of "How to handle files that are different" 231 done 232 unset NO_INSTALLED 233 echo '' 234 case "${VERBOSE}" in 235 '') ;; 236 *) 237 sleep 3 238 ;; 239 esac 240} 241 242press_to_continue () { 243 local DISCARD 244 echo -n ' *** Press the [Enter] or [Return] key to continue ' 245 read DISCARD 246} 247 248# Set the default path for the temporary root environment 249# 250TEMPROOT='/var/tmp/temproot' 251 252# Read /etc/mergemaster.rc first so the one in $HOME can override 253# 254if [ -r /etc/mergemaster.rc ]; then 255 . /etc/mergemaster.rc 256fi 257 258# Read .mergemasterrc before command line so CLI can override 259# 260if [ -r "$HOME/.mergemasterrc" ]; then 261 . "$HOME/.mergemasterrc" 262fi 263 264# Assign the location of the mtree database 265# 266MTREEDB=${MTREEDB:-${DESTDIR}/var/db} 267MTREEFILE="${MTREEDB}/mergemaster.mtree" 268 269# Check the command line options 270# 271while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do 272 case "${COMMAND_LINE_ARGUMENT}" in 273 A) 274 ARCHSTRING='TARGET_ARCH='${OPTARG} 275 ;; 276 F) 277 FREEBSD_ID=yes 278 ;; 279 U) 280 AUTO_UPGRADE=yes 281 ;; 282 s) 283 STRICT=yes 284 unset DIFF_OPTIONS 285 ;; 286 c) 287 DIFF_FLAG='-c' 288 ;; 289 r) 290 RERUN=yes 291 ;; 292 v) 293 case "${AUTO_RUN}" in 294 '') VERBOSE=yes ;; 295 esac 296 ;; 297 a) 298 AUTO_RUN=yes 299 unset VERBOSE 300 ;; 301 h) 302 display_usage 303 display_help 304 exit 0 305 ;; 306 i) 307 AUTO_INSTALL=yes 308 ;; 309 C) 310 COMP_CONFS=yes 311 ;; 312 P) 313 PRESERVE_FILES=yes 314 ;; 315 p) 316 PRE_WORLD=yes 317 unset COMP_CONFS 318 unset AUTO_RUN 319 ;; 320 m) 321 SOURCEDIR=${OPTARG} 322 ;; 323 t) 324 TEMPROOT=${OPTARG} 325 ;; 326 d) 327 TEMPROOT=${TEMPROOT}.`date +%m%d.%H.%M` 328 ;; 329 u) 330 NEW_UMASK=${OPTARG} 331 ;; 332 w) 333 SCREEN_WIDTH=${OPTARG} 334 ;; 335 D) 336 DESTDIR=${OPTARG} 337 ;; 338 *) 339 display_usage 340 exit 1 341 ;; 342 esac 343done 344 345# Don't force the user to set this in the mergemaster rc file 346if [ -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` 348 mkdir -p ${PRESERVE_FILES_DIR} 349fi 350 351# Check for the mtree database in DESTDIR 352case "${AUTO_UPGRADE}" in 353'') ;; # If the option is not set no need to run the test or warn the user 354*) 355 if [ ! -s "${MTREEFILE}" ]; then 356 echo '' 357 echo "*** Unable to find mtree database (${MTREEFILE})." 358 echo " Skipping auto-upgrade on this run." 359 echo " It will be created for the next run when this one is complete." 360 echo '' 361 case "${AUTO_RUN}" in 362 '') 363 press_to_continue 364 ;; 365 esac 366 unset AUTO_UPGRADE 367 fi 368 ;; 369esac 370 371if [ -e "${DESTDIR}/etc/fstab" ]; then 372 if grep -q nodev ${DESTDIR}/etc/fstab; then 373 echo '' 374 echo "*** You have the deprecated 'nodev' option in ${DESTDIR}/etc/fstab." 375 echo " This can prevent the filesystem from being mounted on reboot." 376 echo " Please update your fstab before continuing." 377 echo " See fstab(5) for more information." 378 echo '' 379 exit 1 380 fi 381fi 382 383echo '' 384 385# If the user has a pager defined, make sure we can run it 386# 387case "${DONT_CHECK_PAGER}" in 388'') 389check_pager () { 390 while ! type "${PAGER%% *}" >/dev/null; do 391 echo " *** Your PAGER environment variable specifies '${PAGER}', but" 392 echo " due to the limited PATH that I use for security reasons," 393 echo " I cannot execute it. So, what would you like to do?" 394 echo '' 395 echo " Use 'e' to exit mergemaster and fix your PAGER variable" 396 if [ -x /usr/bin/less -o -x /usr/local/bin/less ]; then 397 echo " Use 'l' to set PAGER to 'less' for this run" 398 fi 399 echo " Use 'm' to use plain old 'more' as your PAGER for this run" 400 echo '' 401 echo " Default is to use plain old 'more' " 402 echo '' 403 echo -n "What should I do? [Use 'more'] " 404 read FIXPAGER 405 406 case "${FIXPAGER}" in 407 [eE]) 408 exit 0 409 ;; 410 [lL]) 411 if [ -x /usr/bin/less ]; then 412 PAGER=/usr/bin/less 413 elif [ -x /usr/local/bin/less ]; then 414 PAGER=/usr/local/bin/less 415 else 416 echo '' 417 echo " *** Fatal Error:" 418 echo " You asked to use 'less' as your pager, but I can't" 419 echo " find it in /usr/bin or /usr/local/bin" 420 exit 1 421 fi 422 ;; 423 [mM]|'') 424 PAGER=more 425 ;; 426 *) 427 echo '' 428 echo "invalid choice: ${FIXPAGER}" 429 esac 430 echo '' 431 done 432} 433 if [ -n "${PAGER}" ]; then 434 check_pager 435 fi 436 ;; 437esac 438 439# If user has a pager defined, or got assigned one above, use it. 440# If not, use more. 441# 442PAGER=${PAGER:-more} 443 444if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then 445 echo " *** You have ${PAGER} defined as your pager so we will use that" 446 echo '' 447 sleep 3 448fi 449 450# Assign the diff flag once so we will not have to keep testing it 451# 452DIFF_FLAG=${DIFF_FLAG:--u} 453 454# Assign the source directory 455# 456SOURCEDIR=${SOURCEDIR:-/usr/src} 457if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \ 458 -f ${SOURCEDIR}/../Makefile.inc1 ]; then 459 echo " *** The source directory you specified (${SOURCEDIR})" 460 echo " will be reset to ${SOURCEDIR}/.." 461 echo '' 462 sleep 3 463 SOURCEDIR=${SOURCEDIR}/.. 464fi 465 466# Setup make to use system files from SOURCEDIR 467MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" 468 469# Check DESTDIR against the mergemaster mtree database to see what 470# files the user changed from the reference files. 471# 472if [ -n "${AUTO_UPGRADE}" -a -s "${MTREEFILE}" ]; then 473 CHANGED=: 474 for file in `mtree -eqL -f ${MTREEFILE} -p ${DESTDIR}/ \ 475 2>/dev/null | awk '($2 == "changed") {print $1}'`; do 476 if [ -f "${DESTDIR}/$file" ]; then 477 CHANGED="${CHANGED}${DESTDIR}/${file}:" 478 fi 479 done 480 [ "$CHANGED" = ':' ] && unset CHANGED 481fi 482 483# Check the width of the user's terminal 484# 485if [ -t 0 ]; then 486 w=`tput columns` 487 case "${w}" in 488 0|'') ;; # No-op, since the input is not valid 489 *) 490 case "${SCREEN_WIDTH}" in 491 '') SCREEN_WIDTH="${w}" ;; 492 "${w}") ;; # No-op, since they are the same 493 *) 494 echo -n "*** You entered ${SCREEN_WIDTH} as your screen width, but stty " 495 echo "thinks it is ${w}." 496 echo '' 497 echo -n "What would you like to use? [${w}] " 498 read SCREEN_WIDTH 499 case "${SCREEN_WIDTH}" in 500 '') SCREEN_WIDTH="${w}" ;; 501 esac 502 ;; 503 esac 504 esac 505fi 506 507# Define what CVS $Id tag to look for to aid portability. 508# 509CVS_ID_TAG=FreeBSD 510 511delete_temproot () { 512 rm -rf "${TEMPROOT}" 2>/dev/null 513 chflags -R 0 "${TEMPROOT}" 2>/dev/null 514 rm -rf "${TEMPROOT}" || exit 1 515} 516 517case "${RERUN}" in 518'') 519 # Set up the loop to test for the existence of the 520 # temp root directory. 521 # 522 TEST_TEMP_ROOT=yes 523 while [ "${TEST_TEMP_ROOT}" = "yes" ]; do 524 if [ -d "${TEMPROOT}" ]; then 525 echo "*** The directory specified for the temporary root environment," 526 echo " ${TEMPROOT}, exists. This can be a security risk if untrusted" 527 echo " users have access to the system." 528 echo '' 529 case "${AUTO_RUN}" in 530 '') 531 echo " Use 'd' to delete the old ${TEMPROOT} and continue" 532 echo " Use 't' to select a new temporary root directory" 533 echo " Use 'e' to exit mergemaster" 534 echo '' 535 echo " Default is to use ${TEMPROOT} as is" 536 echo '' 537 echo -n "How should I deal with this? [Use the existing ${TEMPROOT}] " 538 read DELORNOT 539 540 case "${DELORNOT}" in 541 [dD]) 542 echo '' 543 echo " *** Deleting the old ${TEMPROOT}" 544 echo '' 545 delete_temproot || exit 1 546 unset TEST_TEMP_ROOT 547 ;; 548 [tT]) 549 echo " *** Enter new directory name for temporary root environment" 550 read TEMPROOT 551 ;; 552 [eE]) 553 exit 0 554 ;; 555 '') 556 echo '' 557 echo " *** Leaving ${TEMPROOT} intact" 558 echo '' 559 unset TEST_TEMP_ROOT 560 ;; 561 *) 562 echo '' 563 echo "invalid choice: ${DELORNOT}" 564 echo '' 565 ;; 566 esac 567 ;; 568 *) 569 # If this is an auto-run, try a hopefully safe alternative then 570 # re-test anyway. 571 TEMPROOT=/var/tmp/temproot.`date +%m%d.%H.%M.%S` 572 ;; 573 esac 574 else 575 unset TEST_TEMP_ROOT 576 fi 577 done 578 579 echo "*** Creating the temporary root environment in ${TEMPROOT}" 580 581 if mkdir -p "${TEMPROOT}"; then 582 echo " *** ${TEMPROOT} ready for use" 583 fi 584 585 if [ ! -d "${TEMPROOT}" ]; then 586 echo '' 587 echo " *** FATAL ERROR: Cannot create ${TEMPROOT}" 588 echo '' 589 exit 1 590 fi 591 592 echo " *** Creating and populating directory structure in ${TEMPROOT}" 593 echo '' 594 595 case "${VERBOSE}" in 596 '') ;; 597 *) 598 press_to_continue 599 ;; 600 esac 601 602 case "${PRE_WORLD}" in 603 '') 604 { cd ${SOURCEDIR} && 605 case "${DESTDIR}" in 606 '') ;; 607 *) 608 ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs 609 ;; 610 esac 611 od=${TEMPROOT}/usr/obj 612 ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs && 613 MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc && 614 MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc && 615 MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || 616 { echo ''; 617 echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; 618 echo " the temproot environment"; 619 echo ''; 620 exit 1;} 621 ;; 622 *) 623 # Only set up files that are crucial to {build|install}world 624 { mkdir -p ${TEMPROOT}/etc && 625 cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc && 626 cp -p ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} || 627 { echo ''; 628 echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; 629 echo ''; 630 exit 1;} 631 ;; 632 esac 633 634 # Doing the inventory and removing files that we don't want to compare only 635 # makes sense if we are not doing a rerun, since we have no way of knowing 636 # what happened to the files during previous incarnations. 637 case "${VERBOSE}" in 638 '') ;; 639 *) 640 echo '' 641 echo ' *** The following files exist only in the installed version of' 642 echo " ${DESTDIR}/etc. In the vast majority of cases these files" 643 echo ' are necessary parts of the system and should not be deleted.' 644 echo ' However because these files are not updated by this process you' 645 echo ' might want to verify their status before rebooting your system.' 646 echo '' 647 press_to_continue 648 diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER} 649 echo '' 650 press_to_continue 651 ;; 652 esac 653 654 # Avoid comparing the motd if the user specifies it in .mergemasterrc 655 # Compatibility shim to be removed in FreeBSD 9.x 656 case "${IGNORE_MOTD}" in 657 '') ;; 658 *) IGNORE_FILES="${IGNORE_FILES} /etc/motd" 659 echo '' 660 echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file." 661 echo " This option is deprecated in favor of the IGNORE_FILES option." 662 echo " Please update your rc file accordingly." 663 echo '' 664 press_to_continue 665 ;; 666 esac 667 668 # Avoid comparing the following user specified files 669 for file in ${IGNORE_FILES}; do 670 test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file} 671 done 672 673 # We really don't want to have to deal with files like login.conf.db, pwd.db, 674 # or spwd.db. Instead, we want to compare the text versions, and run *_mkdb. 675 # Prompt the user to do so below, as needed. 676 # 677 rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd 678 679 # We only need to compare things like freebsd.cf once 680 find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null 681 682 # Delete stuff we do not need to keep the mtree database small, 683 # and to make the actual comparison faster. 684 find ${TEMPROOT}/usr -type l -delete 2>/dev/null 685 find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null 686 find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null 687 688 # Build the mtree database in a temporary location. 689 MTREENEW=`mktemp -t mergemaster.mtree` 690 case "${PRE_WORLD}" in 691 '') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null 692 ;; 693 *) # We don't want to mess with the mtree database on a pre-world run or 694 # when re-scanning a previously-built tree. 695 ;; 696 esac 697 ;; # End of the "RERUN" test 698esac 699 700# Get ready to start comparing files 701 702# Check umask if not specified on the command line, 703# and we are not doing an autorun 704# 705if [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN}" ]; then 706 USER_UMASK=`umask` 707 case "${USER_UMASK}" in 708 0022|022) ;; 709 *) 710 echo '' 711 echo " *** Your umask is currently set to ${USER_UMASK}. By default, this script" 712 echo " installs all files with the same user, group and modes that" 713 echo " they are created with by ${SOURCEDIR}/etc/Makefile, compared to" 714 echo " a umask of 022. This umask allows world read permission when" 715 echo " the file's default permissions have it." 716 echo '' 717 echo " No world permissions can sometimes cause problems. A umask of" 718 echo " 022 will restore the default behavior, but is not mandatory." 719 echo " /etc/master.passwd is a special case. Its file permissions" 720 echo " will be 600 (rw-------) if installed." 721 echo '' 722 echo -n "What umask should I use? [${USER_UMASK}] " 723 read NEW_UMASK 724 725 NEW_UMASK="${NEW_UMASK:-$USER_UMASK}" 726 ;; 727 esac 728 echo '' 729fi 730 731CONFIRMED_UMASK=${NEW_UMASK:-0022} 732 733# 734# Warn users who still have old rc files 735# 736for file in atm devfs diskless1 diskless2 network network6 pccard \ 737 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 738 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 739 OLD_RC_PRESENT=1 740 break 741 fi 742done 743 744case "${OLD_RC_PRESENT}" in 7451) 746 echo '' 747 echo " *** There are elements of the old rc system in ${DESTDIR}/etc/." 748 echo '' 749 echo ' While these scripts will not hurt anything, they are not' 750 echo ' functional on an up to date system, and can be removed.' 751 echo '' 752 753 case "${AUTO_RUN}" in 754 '') 755 echo -n 'Move these files to /var/tmp/mergemaster/old_rc? [yes] ' 756 read MOVE_OLD_RC 757 758 case "${MOVE_OLD_RC}" in 759 [nN]*) ;; 760 *) 761 mkdir -p /var/tmp/mergemaster/old_rc 762 for file in atm devfs diskless1 diskless2 network network6 pccard \ 763 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 764 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 765 mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ 766 fi 767 done 768 echo ' The files have been moved' 769 press_to_continue 770 ;; 771 esac 772 ;; 773 *) ;; 774 esac 775esac 776 777# Use the umask/mode information to install the files 778# Create directories as needed 779# 780install_error () { 781 echo "*** FATAL ERROR: Unable to install ${1} to ${2}" 782 echo '' 783 exit 1 784} 785 786do_install_and_rm () { 787 case "${PRESERVE_FILES}" in 788 [Yy][Ee][Ss]) 789 if [ -f "${3}/${2##*/}" ]; then 790 mkdir -p ${PRESERVE_FILES_DIR}/${2%/*} 791 cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*} 792 fi 793 ;; 794 esac 795 796 if [ ! -d "${3}/${2##*/}" ]; then 797 if install -m ${1} ${2} ${3}; then 798 unlink ${2} 799 else 800 install_error ${2} ${3} 801 fi 802 else 803 install_error ${2} ${3} 804 fi 805} 806 807# 4095 = "obase=10;ibase=8;07777" | bc 808find_mode () { 809 local OCTAL 810 OCTAL=$(( ~$(echo "obase=10; ibase=8; ${CONFIRMED_UMASK}" | bc) & 4095 & 811 $(echo "obase=10; ibase=8; $(stat -f "%OMp%OLp" ${1})" | bc) )) 812 printf "%04o\n" ${OCTAL} 813} 814 815mm_install () { 816 local INSTALL_DIR 817 INSTALL_DIR=${1#.} 818 INSTALL_DIR=${INSTALL_DIR%/*} 819 820 case "${INSTALL_DIR}" in 821 '') 822 INSTALL_DIR=/ 823 ;; 824 esac 825 826 if [ -n "${DESTDIR}${INSTALL_DIR}" -a ! -d "${DESTDIR}${INSTALL_DIR}" ]; then 827 DIR_MODE=`find_mode "${TEMPROOT}/${INSTALL_DIR}"` 828 install -d -o root -g wheel -m "${DIR_MODE}" "${DESTDIR}${INSTALL_DIR}" || 829 install_error $1 ${DESTDIR}${INSTALL_DIR} 830 fi 831 832 FILE_MODE=`find_mode "${1}"` 833 834 if [ ! -x "${1}" ]; then 835 case "${1#.}" in 836 /etc/mail/aliases) 837 NEED_NEWALIASES=yes 838 ;; 839 /etc/login.conf) 840 NEED_CAP_MKDB=yes 841 ;; 842 /etc/master.passwd) 843 do_install_and_rm 600 "${1}" "${DESTDIR}${INSTALL_DIR}" 844 NEED_PWD_MKDB=yes 845 DONT_INSTALL=yes 846 ;; 847 /.cshrc | /.profile) 848 local st_nlink 849 850 # install will unlink the file before it installs the new one, 851 # so we have to restore/create the link afterwards. 852 # 853 st_nlink=0 # In case the file does not yet exist 854 eval $(stat -s ${DESTDIR}${COMPFILE#.} 2>/dev/null) 855 856 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 857 858 if [ -n "${AUTO_INSTALL}" -a $st_nlink -gt 1 ]; then 859 HANDLE_LINK=l 860 else 861 case "${LINK_EXPLAINED}" in 862 '') 863 echo " *** Historically BSD derived systems have had a" 864 echo " hard link from /.cshrc and /.profile to" 865 echo " their namesakes in /root. Please indicate" 866 echo " your preference below for bringing your" 867 echo " installed files up to date." 868 echo '' 869 LINK_EXPLAINED=yes 870 ;; 871 esac 872 873 echo " Use 'd' to delete the temporary ${COMPFILE}" 874 echo " Use 'l' to delete the existing ${DESTDIR}/root/${COMPFILE##*/} and create the link" 875 echo '' 876 echo " Default is to leave the temporary file to deal with by hand" 877 echo '' 878 echo -n " How should I handle ${COMPFILE}? [Leave it to install later] " 879 read HANDLE_LINK 880 fi 881 882 case "${HANDLE_LINK}" in 883 [dD]*) 884 rm "${COMPFILE}" 885 echo '' 886 echo " *** Deleting ${COMPFILE}" 887 ;; 888 [lL]*) 889 echo '' 890 unlink ${DESTDIR}/root/${COMPFILE##*/} 891 if ln ${DESTDIR}${COMPFILE#.} ${DESTDIR}/root/${COMPFILE##*/}; then 892 echo " *** Link from ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/} installed successfully" 893 else 894 echo " *** Error linking ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/}" 895 echo " *** ${COMPFILE} will remain for your consideration" 896 fi 897 ;; 898 *) 899 echo " *** ${COMPFILE} will remain for your consideration" 900 ;; 901 esac 902 return 903 ;; 904 esac 905 906 case "${DONT_INSTALL}" in 907 '') 908 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 909 ;; 910 *) 911 unset DONT_INSTALL 912 ;; 913 esac 914 else # File matched -x 915 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 916 fi 917 return $? 918} 919 920if [ ! -d "${TEMPROOT}" ]; then 921 echo "*** FATAL ERROR: The temproot directory (${TEMPROOT})" 922 echo ' has disappeared!' 923 echo '' 924 exit 1 925fi 926 927echo '' 928echo "*** Beginning comparison" 929echo '' 930 931# Pre-world does not populate /etc/rc.d. 932# It is very possible that a previous run would have deleted files in 933# ${TEMPROOT}/etc/rc.d, thus creating a lot of false positives. 934if [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then 935 echo " *** Checking ${DESTDIR}/etc/rc.d for stale files" 936 echo '' 937 cd "${DESTDIR}/etc/rc.d" && 938 for file in *; do 939 if [ ! -e "${TEMPROOT}/etc/rc.d/${file}" ]; then 940 STALE_RC_FILES="${STALE_RC_FILES} ${file}" 941 fi 942 done 943 case "${STALE_RC_FILES}" in 944 ''|' *') 945 echo ' *** No stale files found' 946 ;; 947 *) 948 echo " *** The following files exist in ${DESTDIR}/etc/rc.d but not in" 949 echo " ${TEMPROOT}/etc/rc.d/:" 950 echo '' 951 echo "${STALE_RC_FILES}" 952 echo '' 953 echo ' The presence of stale files in this directory can cause the' 954 echo ' dreaded unpredictable results, and therefore it is highly' 955 echo ' recommended that you delete them.' 956 case "${AUTO_RUN}" in 957 '') 958 echo '' 959 echo -n ' *** Delete them now? [n] ' 960 read DELETE_STALE_RC_FILES 961 case "${DELETE_STALE_RC_FILES}" in 962 [yY]) 963 echo ' *** Deleting ... ' 964 rm ${STALE_RC_FILES} 965 echo ' done.' 966 ;; 967 *) 968 echo ' *** Files will not be deleted' 969 ;; 970 esac 971 sleep 2 972 ;; 973 *) 974 if [ -n "${DELETE_STALE_RC_FILES}" ]; then 975 echo ' *** Deleting ... ' 976 rm ${STALE_RC_FILES} 977 echo ' done.' 978 fi 979 esac 980 ;; 981 esac 982 echo '' 983fi 984 985cd "${TEMPROOT}" 986 987if [ -r "${MM_PRE_COMPARE_SCRIPT}" ]; then 988 . "${MM_PRE_COMPARE_SCRIPT}" 989fi 990 991# Things that were files/directories/links in one version can sometimes 992# change to something else in a newer version. So we need to explicitly 993# test for this, and warn the user if what we find does not match. 994# 995for COMPFILE in `find . | sort` ; do 996 if [ -e "${DESTDIR}${COMPFILE#.}" ]; then 997 INSTALLED_TYPE=`stat -f '%HT' ${DESTDIR}${COMPFILE#.}` 998 else 999 continue 1000 fi 1001 TEMPROOT_TYPE=`stat -f '%HT' $COMPFILE` 1002 1003 if [ ! "$TEMPROOT_TYPE" = "$INSTALLED_TYPE" ]; then 1004 [ "$COMPFILE" = '.' ] && continue 1005 TEMPROOT_TYPE=`echo $TEMPROOT_TYPE | tr [:upper:] [:lower:]` 1006 INSTALLED_TYPE=`echo $INSTALLED_TYPE | tr [:upper:] [:lower:]` 1007 1008 echo "*** The installed file ${DESTDIR}${COMPFILE#.} has the type \"$INSTALLED_TYPE\"" 1009 echo " but the new version has the type \"$TEMPROOT_TYPE\"" 1010 echo '' 1011 echo " How would you like to handle this?" 1012 echo '' 1013 echo " Use 'r' to remove ${DESTDIR}${COMPFILE#.}" 1014 case "$TEMPROOT_TYPE" in 1015 'symbolic link') 1016 TARGET=`readlink $COMPFILE` 1017 echo " and create a link to $TARGET in its place" ;; 1018 *) echo " You will be able to install it as a \"$TEMPROOT_TYPE\"" ;; 1019 esac 1020 echo '' 1021 echo " Use 'i' to ignore this" 1022 echo '' 1023 echo -n " How to proceed? [i] " 1024 read ANSWER 1025 case "$ANSWER" in 1026 [rR]) case "${PRESERVE_FILES}" in 1027 [Yy][Ee][Ss]) 1028 mv ${DESTDIR}${COMPFILE#.} ${PRESERVE_FILES_DIR}/ || exit 1 ;; 1029 *) rm -rf ${DESTDIR}${COMPFILE#.} ;; 1030 esac 1031 case "$TEMPROOT_TYPE" in 1032 'symbolic link') ln -sf $TARGET ${DESTDIR}${COMPFILE#.} ;; 1033 esac ;; 1034 *) echo '' 1035 echo "*** See the man page about adding ${COMPFILE#.} to the list of IGNORE_FILES" 1036 press_to_continue ;; 1037 esac 1038 echo '' 1039 fi 1040done 1041 1042for COMPFILE in `find . -type f | sort`; do 1043 1044 # First, check to see if the file exists in DESTDIR. If not, the 1045 # diff_loop function knows how to handle it. 1046 # 1047 if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then 1048 case "${AUTO_RUN}" in 1049 '') 1050 diff_loop 1051 ;; 1052 *) 1053 case "${AUTO_INSTALL}" in 1054 '') 1055 # If this is an auto run, make it official 1056 echo " *** ${COMPFILE} will remain for your consideration" 1057 ;; 1058 *) 1059 diff_loop 1060 ;; 1061 esac 1062 ;; 1063 esac # Auto run test 1064 continue 1065 fi 1066 1067 case "${STRICT}" in 1068 '' | [Nn][Oo]) 1069 # Compare CVS $Id's first so if the file hasn't been modified 1070 # local changes will be ignored. 1071 # If the files have the same $Id, delete the one in temproot so the 1072 # user will have less to wade through if files are left to merge by hand. 1073 # 1074 CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` 1075 CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID2=none 1076 1077 case "${CVSID2}" in 1078 "${CVSID1}") 1079 echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting" 1080 rm "${COMPFILE}" 1081 ;; 1082 esac 1083 ;; 1084 esac 1085 1086 # If the file is still here either because the $Ids are different, the 1087 # file doesn't have an $Id, or we're using STRICT mode; look at the diff. 1088 # 1089 if [ -f "${COMPFILE}" ]; then 1090 1091 # Do an absolute diff first to see if the files are actually different. 1092 # If they're not different, delete the one in temproot. 1093 # 1094 if diff -q ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \ 1095 /dev/null 2>&1; then 1096 echo " *** Temp ${COMPFILE} and installed are the same, deleting" 1097 rm "${COMPFILE}" 1098 else 1099 # Ok, the files are different, so show the user where they differ. 1100 # Use user's choice of diff methods; and user's pager if they have one. 1101 # Use more if not. 1102 # Use unified diffs by default. Context diffs give me a headache. :) 1103 # 1104 # If the user chose the -F option, test for that before proceeding 1105 # 1106 if [ -n "$FREEBSD_ID" ]; then 1107 if diff -q -I'[$]FreeBSD.*[$]' "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \ 1108 /dev/null 2>&1; then 1109 if mm_install "${COMPFILE}"; then 1110 echo "*** Updated revision control Id for ${DESTDIR}${COMPFILE#.}" 1111 else 1112 echo "*** Problem installing ${COMPFILE}, it will remain to merge by hand later" 1113 fi 1114 continue 1115 fi 1116 fi 1117 case "${AUTO_RUN}" in 1118 '') 1119 # prompt user to install/delete/merge changes 1120 diff_loop 1121 ;; 1122 *) 1123 # If this is an auto run, make it official 1124 echo " *** ${COMPFILE} will remain for your consideration" 1125 ;; 1126 esac # Auto run test 1127 fi # Yes, the files are different 1128 fi # Yes, the file still remains to be checked 1129done # This is for the for way up there at the beginning of the comparison 1130 1131echo '' 1132echo "*** Comparison complete" 1133 1134if [ -s "${MTREENEW}" ]; then 1135 echo "*** Saving mtree database for future upgrades" 1136 test -e "${MTREEFILE}" && unlink ${MTREEFILE} 1137 mv ${MTREENEW} ${MTREEFILE} 1138fi 1139 1140echo '' 1141 1142TEST_FOR_FILES=`find ${TEMPROOT} -type f -size +0 2>/dev/null` 1143if [ -n "${TEST_FOR_FILES}" ]; then 1144 echo "*** Files that remain for you to merge by hand:" 1145 find "${TEMPROOT}" -type f -size +0 | sort 1146 echo '' 1147fi 1148 1149case "${AUTO_RUN}" in 1150'') 1151 echo -n "Do you wish to delete what is left of ${TEMPROOT}? [no] " 1152 read DEL_TEMPROOT 1153 1154 case "${DEL_TEMPROOT}" in 1155 [yY]*) 1156 if delete_temproot; then 1157 echo " *** ${TEMPROOT} has been deleted" 1158 else 1159 echo " *** Unable to delete ${TEMPROOT}" 1160 fi 1161 ;; 1162 *) 1163 echo " *** ${TEMPROOT} will remain" 1164 ;; 1165 esac 1166 ;; 1167*) ;; 1168esac 1169 1170case "${AUTO_INSTALLED_FILES}" in 1171'') ;; 1172*) 1173 case "${AUTO_RUN}" in 1174 '') 1175 ( 1176 echo '' 1177 echo '*** You chose the automatic install option for files that did not' 1178 echo ' exist on your system. The following were installed for you:' 1179 echo "${AUTO_INSTALLED_FILES}" 1180 ) | ${PAGER} 1181 ;; 1182 *) 1183 echo '' 1184 echo '*** You chose the automatic install option for files that did not' 1185 echo ' exist on your system. The following were installed for you:' 1186 echo "${AUTO_INSTALLED_FILES}" 1187 ;; 1188 esac 1189 ;; 1190esac 1191 1192case "${AUTO_UPGRADED_FILES}" in 1193'') ;; 1194*) 1195 case "${AUTO_RUN}" in 1196 '') 1197 ( 1198 echo '' 1199 echo '*** You chose the automatic upgrade option for files that you did' 1200 echo ' not alter on your system. The following were upgraded for you:' 1201 echo "${AUTO_UPGRADED_FILES}" 1202 ) | ${PAGER} 1203 ;; 1204 *) 1205 echo '' 1206 echo '*** You chose the automatic upgrade option for files that you did' 1207 echo ' not alter on your system. The following were upgraded for you:' 1208 echo "${AUTO_UPGRADED_FILES}" 1209 ;; 1210 esac 1211 ;; 1212esac 1213 1214run_it_now () { 1215 case "${AUTO_RUN}" in 1216 '') 1217 unset YES_OR_NO 1218 echo '' 1219 echo -n ' Would you like to run it now? y or n [n] ' 1220 read YES_OR_NO 1221 1222 case "${YES_OR_NO}" in 1223 y) 1224 echo " Running ${1}" 1225 echo '' 1226 eval "${1}" 1227 ;; 1228 ''|n) 1229 echo '' 1230 echo " *** Cancelled" 1231 echo '' 1232 echo " Make sure to run ${1} yourself" 1233 ;; 1234 *) 1235 echo '' 1236 echo " *** Sorry, I do not understand your answer (${YES_OR_NO})" 1237 echo '' 1238 echo " Make sure to run ${1} yourself" 1239 esac 1240 ;; 1241 *) ;; 1242 esac 1243} 1244 1245case "${NEED_NEWALIASES}" in 1246'') ;; 1247*) 1248 echo '' 1249 if [ -n "${DESTDIR}" ]; then 1250 echo "*** You installed a new aliases file into ${DESTDIR}/etc/mail, but" 1251 echo " the newaliases command is limited to the directories configured" 1252 echo " in sendmail.cf. Make sure to create your aliases database by" 1253 echo " hand when your sendmail configuration is done." 1254 else 1255 echo "*** You installed a new aliases file, so make sure that you run" 1256 echo " '/usr/bin/newaliases' to rebuild your aliases database" 1257 run_it_now '/usr/bin/newaliases' 1258 fi 1259 ;; 1260esac 1261 1262case "${NEED_CAP_MKDB}" in 1263'') ;; 1264*) 1265 echo '' 1266 echo "*** You installed a login.conf file, so make sure that you run" 1267 echo " '/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf'" 1268 echo " to rebuild your login.conf database" 1269 run_it_now "/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf" 1270 ;; 1271esac 1272 1273case "${NEED_PWD_MKDB}" in 1274'') ;; 1275*) 1276 echo '' 1277 echo "*** You installed a new master.passwd file, so make sure that you run" 1278 if [ -n "${DESTDIR}" ]; then 1279 echo " '/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd'" 1280 echo " to rebuild your password files" 1281 run_it_now "/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd" 1282 else 1283 echo " '/usr/sbin/pwd_mkdb -p /etc/master.passwd'" 1284 echo " to rebuild your password files" 1285 run_it_now '/usr/sbin/pwd_mkdb -p /etc/master.passwd' 1286 fi 1287 ;; 1288esac 1289 1290echo '' 1291 1292if [ -r "${MM_EXIT_SCRIPT}" ]; then 1293 . "${MM_EXIT_SCRIPT}" 1294fi 1295 1296case "${COMP_CONFS}" in 1297'') ;; 1298*) 1299 . ${DESTDIR}/etc/defaults/rc.conf 1300 1301 (echo '' 1302 echo "*** Comparing conf files: ${rc_conf_files}" 1303 1304 for CONF_FILE in ${rc_conf_files}; do 1305 if [ -r "${DESTDIR}${CONF_FILE}" ]; then 1306 echo '' 1307 echo "*** From ${DESTDIR}${CONF_FILE}" 1308 echo "*** From ${DESTDIR}/etc/defaults/rc.conf" 1309 1310 for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} | 1311 cut -d '=' -f 1`; do 1312 echo '' 1313 grep -w ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE} 1314 grep -w ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf || 1315 echo ' * No default variable with this name' 1316 done 1317 fi 1318 done) | ${PAGER} 1319 echo '' 1320 ;; 1321esac 1322 1323case "${PRE_WORLD}" in 1324'') ;; 1325*) 1326 MAKE_CONF="${SOURCEDIR}/share/examples/etc/make.conf" 1327 1328 (echo '' 1329 echo '*** Comparing make variables' 1330 echo '' 1331 echo "*** From ${DESTDIR}/etc/make.conf" 1332 echo "*** From ${MAKE_CONF}" 1333 1334 for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`; do 1335 echo '' 1336 grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf 1337 grep -w ^#${MAKE_VAR} ${MAKE_CONF} || 1338 echo ' * No example variable with this name' 1339 done) | ${PAGER} 1340 ;; 1341esac 1342 1343if [ -n "${PRESERVE_FILES}" ]; then 1344 find -d $PRESERVE_FILES_DIR -type d -empty -delete 2>/dev/null 1345 rmdir $PRESERVE_FILES_DIR 2>/dev/null 1346fi 1347 1348exit 0 1349