mergemaster.sh revision 202339
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-2010 Douglas Barton 9# DougB@FreeBSD.org 10 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 202339 2010-01-15 03:56:48Z 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}" || { echo "*** Unable to delete ${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 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 case "${IGNORE_MOTD}" in 655 *) 656 echo '' 657 echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file." 658 echo " This option is deprecated in favor of the IGNORE_FILES option." 659 echo " Please update your rc file accordingly." 660 echo '' 661 exit 1 662 ;; 663 esac 664 665 # Avoid comparing the following user specified files 666 for file in ${IGNORE_FILES}; do 667 test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file} 668 done 669 670 # We really don't want to have to deal with files like login.conf.db, pwd.db, 671 # or spwd.db. Instead, we want to compare the text versions, and run *_mkdb. 672 # Prompt the user to do so below, as needed. 673 # 674 rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd 675 676 # We only need to compare things like freebsd.cf once 677 find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null 678 679 # Delete stuff we do not need to keep the mtree database small, 680 # and to make the actual comparison faster. 681 find ${TEMPROOT}/usr -type l -delete 2>/dev/null 682 find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null 683 find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null 684 685 # Build the mtree database in a temporary location. 686 case "${PRE_WORLD}" in 687 '') MTREENEW=`mktemp -t mergemaster.mtree` 688 mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null 689 ;; 690 *) # We don't want to mess with the mtree database on a pre-world run or 691 # when re-scanning a previously-built tree. 692 ;; 693 esac 694 ;; # End of the "RERUN" test 695esac 696 697# Get ready to start comparing files 698 699# Check umask if not specified on the command line, 700# and we are not doing an autorun 701# 702if [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN}" ]; then 703 USER_UMASK=`umask` 704 case "${USER_UMASK}" in 705 0022|022) ;; 706 *) 707 echo '' 708 echo " *** Your umask is currently set to ${USER_UMASK}. By default, this script" 709 echo " installs all files with the same user, group and modes that" 710 echo " they are created with by ${SOURCEDIR}/etc/Makefile, compared to" 711 echo " a umask of 022. This umask allows world read permission when" 712 echo " the file's default permissions have it." 713 echo '' 714 echo " No world permissions can sometimes cause problems. A umask of" 715 echo " 022 will restore the default behavior, but is not mandatory." 716 echo " /etc/master.passwd is a special case. Its file permissions" 717 echo " will be 600 (rw-------) if installed." 718 echo '' 719 echo -n "What umask should I use? [${USER_UMASK}] " 720 read NEW_UMASK 721 722 NEW_UMASK="${NEW_UMASK:-$USER_UMASK}" 723 ;; 724 esac 725 echo '' 726fi 727 728CONFIRMED_UMASK=${NEW_UMASK:-0022} 729 730# 731# Warn users who still have old rc files 732# 733for file in atm devfs diskless1 diskless2 network network6 pccard \ 734 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 735 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 736 OLD_RC_PRESENT=1 737 break 738 fi 739done 740 741case "${OLD_RC_PRESENT}" in 7421) 743 echo '' 744 echo " *** There are elements of the old rc system in ${DESTDIR}/etc/." 745 echo '' 746 echo ' While these scripts will not hurt anything, they are not' 747 echo ' functional on an up to date system, and can be removed.' 748 echo '' 749 750 case "${AUTO_RUN}" in 751 '') 752 echo -n 'Move these files to /var/tmp/mergemaster/old_rc? [yes] ' 753 read MOVE_OLD_RC 754 755 case "${MOVE_OLD_RC}" in 756 [nN]*) ;; 757 *) 758 mkdir -p /var/tmp/mergemaster/old_rc 759 for file in atm devfs diskless1 diskless2 network network6 pccard \ 760 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 761 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 762 mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ 763 fi 764 done 765 echo ' The files have been moved' 766 press_to_continue 767 ;; 768 esac 769 ;; 770 *) ;; 771 esac 772esac 773 774# Use the umask/mode information to install the files 775# Create directories as needed 776# 777install_error () { 778 echo "*** FATAL ERROR: Unable to install ${1} to ${2}" 779 echo '' 780 exit 1 781} 782 783do_install_and_rm () { 784 case "${PRESERVE_FILES}" in 785 [Yy][Ee][Ss]) 786 if [ -f "${3}/${2##*/}" ]; then 787 mkdir -p ${PRESERVE_FILES_DIR}/${2%/*} 788 cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*} 789 fi 790 ;; 791 esac 792 793 if [ ! -d "${3}/${2##*/}" ]; then 794 if install -m ${1} ${2} ${3}; then 795 unlink ${2} 796 else 797 install_error ${2} ${3} 798 fi 799 else 800 install_error ${2} ${3} 801 fi 802} 803 804# 4095 = "obase=10;ibase=8;07777" | bc 805find_mode () { 806 local OCTAL 807 OCTAL=$(( ~$(echo "obase=10; ibase=8; ${CONFIRMED_UMASK}" | bc) & 4095 & 808 $(echo "obase=10; ibase=8; $(stat -f "%OMp%OLp" ${1})" | bc) )) 809 printf "%04o\n" ${OCTAL} 810} 811 812mm_install () { 813 local INSTALL_DIR 814 INSTALL_DIR=${1#.} 815 INSTALL_DIR=${INSTALL_DIR%/*} 816 817 case "${INSTALL_DIR}" in 818 '') 819 INSTALL_DIR=/ 820 ;; 821 esac 822 823 if [ -n "${DESTDIR}${INSTALL_DIR}" -a ! -d "${DESTDIR}${INSTALL_DIR}" ]; then 824 DIR_MODE=`find_mode "${TEMPROOT}/${INSTALL_DIR}"` 825 install -d -o root -g wheel -m "${DIR_MODE}" "${DESTDIR}${INSTALL_DIR}" || 826 install_error $1 ${DESTDIR}${INSTALL_DIR} 827 fi 828 829 FILE_MODE=`find_mode "${1}"` 830 831 if [ ! -x "${1}" ]; then 832 case "${1#.}" in 833 /etc/mail/aliases) 834 NEED_NEWALIASES=yes 835 ;; 836 /etc/login.conf) 837 NEED_CAP_MKDB=yes 838 ;; 839 /etc/master.passwd) 840 do_install_and_rm 600 "${1}" "${DESTDIR}${INSTALL_DIR}" 841 NEED_PWD_MKDB=yes 842 DONT_INSTALL=yes 843 ;; 844 /.cshrc | /.profile) 845 local st_nlink 846 847 # install will unlink the file before it installs the new one, 848 # so we have to restore/create the link afterwards. 849 # 850 st_nlink=0 # In case the file does not yet exist 851 eval $(stat -s ${DESTDIR}${COMPFILE#.} 2>/dev/null) 852 853 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 854 855 if [ -n "${AUTO_INSTALL}" -a $st_nlink -gt 1 ]; then 856 HANDLE_LINK=l 857 else 858 case "${LINK_EXPLAINED}" in 859 '') 860 echo " *** Historically BSD derived systems have had a" 861 echo " hard link from /.cshrc and /.profile to" 862 echo " their namesakes in /root. Please indicate" 863 echo " your preference below for bringing your" 864 echo " installed files up to date." 865 echo '' 866 LINK_EXPLAINED=yes 867 ;; 868 esac 869 870 echo " Use 'd' to delete the temporary ${COMPFILE}" 871 echo " Use 'l' to delete the existing ${DESTDIR}/root/${COMPFILE##*/} and create the link" 872 echo '' 873 echo " Default is to leave the temporary file to deal with by hand" 874 echo '' 875 echo -n " How should I handle ${COMPFILE}? [Leave it to install later] " 876 read HANDLE_LINK 877 fi 878 879 case "${HANDLE_LINK}" in 880 [dD]*) 881 rm "${COMPFILE}" 882 echo '' 883 echo " *** Deleting ${COMPFILE}" 884 ;; 885 [lL]*) 886 echo '' 887 unlink ${DESTDIR}/root/${COMPFILE##*/} 888 if ln ${DESTDIR}${COMPFILE#.} ${DESTDIR}/root/${COMPFILE##*/}; then 889 echo " *** Link from ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/} installed successfully" 890 else 891 echo " *** Error linking ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/}" 892 echo " *** ${COMPFILE} will remain for your consideration" 893 fi 894 ;; 895 *) 896 echo " *** ${COMPFILE} will remain for your consideration" 897 ;; 898 esac 899 return 900 ;; 901 esac 902 903 case "${DONT_INSTALL}" in 904 '') 905 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 906 ;; 907 *) 908 unset DONT_INSTALL 909 ;; 910 esac 911 else # File matched -x 912 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 913 fi 914 return $? 915} 916 917if [ ! -d "${TEMPROOT}" ]; then 918 echo "*** FATAL ERROR: The temproot directory (${TEMPROOT})" 919 echo ' has disappeared!' 920 echo '' 921 exit 1 922fi 923 924echo '' 925echo "*** Beginning comparison" 926echo '' 927 928# Pre-world does not populate /etc/rc.d. 929# It is very possible that a previous run would have deleted files in 930# ${TEMPROOT}/etc/rc.d, thus creating a lot of false positives. 931if [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then 932 echo " *** Checking ${DESTDIR}/etc/rc.d for stale files" 933 echo '' 934 cd "${DESTDIR}/etc/rc.d" && 935 for file in *; do 936 if [ ! -e "${TEMPROOT}/etc/rc.d/${file}" ]; then 937 STALE_RC_FILES="${STALE_RC_FILES} ${file}" 938 fi 939 done 940 case "${STALE_RC_FILES}" in 941 ''|' *') 942 echo ' *** No stale files found' 943 ;; 944 *) 945 echo " *** The following files exist in ${DESTDIR}/etc/rc.d but not in" 946 echo " ${TEMPROOT}/etc/rc.d/:" 947 echo '' 948 echo "${STALE_RC_FILES}" 949 echo '' 950 echo ' The presence of stale files in this directory can cause the' 951 echo ' dreaded unpredictable results, and therefore it is highly' 952 echo ' recommended that you delete them.' 953 case "${AUTO_RUN}" in 954 '') 955 echo '' 956 echo -n ' *** Delete them now? [n] ' 957 read DELETE_STALE_RC_FILES 958 case "${DELETE_STALE_RC_FILES}" in 959 [yY]) 960 echo ' *** Deleting ... ' 961 rm ${STALE_RC_FILES} 962 echo ' done.' 963 ;; 964 *) 965 echo ' *** Files will not be deleted' 966 ;; 967 esac 968 sleep 2 969 ;; 970 *) 971 if [ -n "${DELETE_STALE_RC_FILES}" ]; then 972 echo ' *** Deleting ... ' 973 rm ${STALE_RC_FILES} 974 echo ' done.' 975 fi 976 esac 977 ;; 978 esac 979 echo '' 980fi 981 982cd "${TEMPROOT}" 983 984if [ -r "${MM_PRE_COMPARE_SCRIPT}" ]; then 985 . "${MM_PRE_COMPARE_SCRIPT}" 986fi 987 988# Things that were files/directories/links in one version can sometimes 989# change to something else in a newer version. So we need to explicitly 990# test for this, and warn the user if what we find does not match. 991# 992for COMPFILE in `find . | sort` ; do 993 if [ -e "${DESTDIR}${COMPFILE#.}" ]; then 994 INSTALLED_TYPE=`stat -f '%HT' ${DESTDIR}${COMPFILE#.}` 995 else 996 continue 997 fi 998 TEMPROOT_TYPE=`stat -f '%HT' $COMPFILE` 999 1000 if [ ! "$TEMPROOT_TYPE" = "$INSTALLED_TYPE" ]; then 1001 [ "$COMPFILE" = '.' ] && continue 1002 TEMPROOT_TYPE=`echo $TEMPROOT_TYPE | tr [:upper:] [:lower:]` 1003 INSTALLED_TYPE=`echo $INSTALLED_TYPE | tr [:upper:] [:lower:]` 1004 1005 echo "*** The installed file ${DESTDIR}${COMPFILE#.} has the type \"$INSTALLED_TYPE\"" 1006 echo " but the new version has the type \"$TEMPROOT_TYPE\"" 1007 echo '' 1008 echo " How would you like to handle this?" 1009 echo '' 1010 echo " Use 'r' to remove ${DESTDIR}${COMPFILE#.}" 1011 case "$TEMPROOT_TYPE" in 1012 'symbolic link') 1013 TARGET=`readlink $COMPFILE` 1014 echo " and create a link to $TARGET in its place" ;; 1015 *) echo " You will be able to install it as a \"$TEMPROOT_TYPE\"" ;; 1016 esac 1017 echo '' 1018 echo " Use 'i' to ignore this" 1019 echo '' 1020 echo -n " How to proceed? [i] " 1021 read ANSWER 1022 case "$ANSWER" in 1023 [rR]) case "${PRESERVE_FILES}" in 1024 [Yy][Ee][Ss]) 1025 mv ${DESTDIR}${COMPFILE#.} ${PRESERVE_FILES_DIR}/ || exit 1 ;; 1026 *) rm -rf ${DESTDIR}${COMPFILE#.} ;; 1027 esac 1028 case "$TEMPROOT_TYPE" in 1029 'symbolic link') ln -sf $TARGET ${DESTDIR}${COMPFILE#.} ;; 1030 esac ;; 1031 *) echo '' 1032 echo "*** See the man page about adding ${COMPFILE#.} to the list of IGNORE_FILES" 1033 press_to_continue ;; 1034 esac 1035 echo '' 1036 fi 1037done 1038 1039for COMPFILE in `find . -type f | sort`; do 1040 1041 # First, check to see if the file exists in DESTDIR. If not, the 1042 # diff_loop function knows how to handle it. 1043 # 1044 if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then 1045 case "${AUTO_RUN}" in 1046 '') 1047 diff_loop 1048 ;; 1049 *) 1050 case "${AUTO_INSTALL}" in 1051 '') 1052 # If this is an auto run, make it official 1053 echo " *** ${COMPFILE} will remain for your consideration" 1054 ;; 1055 *) 1056 diff_loop 1057 ;; 1058 esac 1059 ;; 1060 esac # Auto run test 1061 continue 1062 fi 1063 1064 case "${STRICT}" in 1065 '' | [Nn][Oo]) 1066 # Compare CVS $Id's first so if the file hasn't been modified 1067 # local changes will be ignored. 1068 # If the files have the same $Id, delete the one in temproot so the 1069 # user will have less to wade through if files are left to merge by hand. 1070 # 1071 CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` 1072 CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID2=none 1073 1074 case "${CVSID2}" in 1075 "${CVSID1}") 1076 echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting" 1077 rm "${COMPFILE}" 1078 ;; 1079 esac 1080 ;; 1081 esac 1082 1083 # If the file is still here either because the $Ids are different, the 1084 # file doesn't have an $Id, or we're using STRICT mode; look at the diff. 1085 # 1086 if [ -f "${COMPFILE}" ]; then 1087 1088 # Do an absolute diff first to see if the files are actually different. 1089 # If they're not different, delete the one in temproot. 1090 # 1091 if diff -q ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \ 1092 /dev/null 2>&1; then 1093 echo " *** Temp ${COMPFILE} and installed are the same, deleting" 1094 rm "${COMPFILE}" 1095 else 1096 # Ok, the files are different, so show the user where they differ. 1097 # Use user's choice of diff methods; and user's pager if they have one. 1098 # Use more if not. 1099 # Use unified diffs by default. Context diffs give me a headache. :) 1100 # 1101 # If the user chose the -F option, test for that before proceeding 1102 # 1103 if [ -n "$FREEBSD_ID" ]; then 1104 if diff -q -I'[$]FreeBSD.*[$]' "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \ 1105 /dev/null 2>&1; then 1106 if mm_install "${COMPFILE}"; then 1107 echo "*** Updated revision control Id for ${DESTDIR}${COMPFILE#.}" 1108 else 1109 echo "*** Problem installing ${COMPFILE}, it will remain to merge by hand later" 1110 fi 1111 continue 1112 fi 1113 fi 1114 case "${AUTO_RUN}" in 1115 '') 1116 # prompt user to install/delete/merge changes 1117 diff_loop 1118 ;; 1119 *) 1120 # If this is an auto run, make it official 1121 echo " *** ${COMPFILE} will remain for your consideration" 1122 ;; 1123 esac # Auto run test 1124 fi # Yes, the files are different 1125 fi # Yes, the file still remains to be checked 1126done # This is for the for way up there at the beginning of the comparison 1127 1128echo '' 1129echo "*** Comparison complete" 1130 1131if [ -s "${MTREENEW}" ]; then 1132 echo "*** Saving mtree database for future upgrades" 1133 test -e "${MTREEFILE}" && unlink ${MTREEFILE} 1134 mv ${MTREENEW} ${MTREEFILE} 1135fi 1136 1137echo '' 1138 1139TEST_FOR_FILES=`find ${TEMPROOT} -type f -size +0 2>/dev/null` 1140if [ -n "${TEST_FOR_FILES}" ]; then 1141 echo "*** Files that remain for you to merge by hand:" 1142 find "${TEMPROOT}" -type f -size +0 | sort 1143 echo '' 1144 1145 case "${AUTO_RUN}" in 1146 '') 1147 echo -n "Do you wish to delete what is left of ${TEMPROOT}? [no] " 1148 read DEL_TEMPROOT 1149 case "${DEL_TEMPROOT}" in 1150 [yY]*) 1151 delete_temproot 1152 ;; 1153 *) 1154 echo " *** ${TEMPROOT} will remain" 1155 ;; 1156 esac 1157 ;; 1158 *) ;; 1159 esac 1160else 1161 echo "*** ${TEMPROOT} is empty, deleting" 1162 delete_temproot 1163fi 1164 1165case "${AUTO_INSTALLED_FILES}" in 1166'') ;; 1167*) 1168 case "${AUTO_RUN}" in 1169 '') 1170 ( 1171 echo '' 1172 echo '*** You chose the automatic install option for files that did not' 1173 echo ' exist on your system. The following were installed for you:' 1174 echo "${AUTO_INSTALLED_FILES}" 1175 ) | ${PAGER} 1176 ;; 1177 *) 1178 echo '' 1179 echo '*** You chose the automatic install option for files that did not' 1180 echo ' exist on your system. The following were installed for you:' 1181 echo "${AUTO_INSTALLED_FILES}" 1182 ;; 1183 esac 1184 ;; 1185esac 1186 1187case "${AUTO_UPGRADED_FILES}" in 1188'') ;; 1189*) 1190 case "${AUTO_RUN}" in 1191 '') 1192 ( 1193 echo '' 1194 echo '*** You chose the automatic upgrade option for files that you did' 1195 echo ' not alter on your system. The following were upgraded for you:' 1196 echo "${AUTO_UPGRADED_FILES}" 1197 ) | ${PAGER} 1198 ;; 1199 *) 1200 echo '' 1201 echo '*** You chose the automatic upgrade option for files that you did' 1202 echo ' not alter on your system. The following were upgraded for you:' 1203 echo "${AUTO_UPGRADED_FILES}" 1204 ;; 1205 esac 1206 ;; 1207esac 1208 1209run_it_now () { 1210 case "${AUTO_RUN}" in 1211 '') 1212 unset YES_OR_NO 1213 echo '' 1214 echo -n ' Would you like to run it now? y or n [n] ' 1215 read YES_OR_NO 1216 1217 case "${YES_OR_NO}" in 1218 y) 1219 echo " Running ${1}" 1220 echo '' 1221 eval "${1}" 1222 ;; 1223 ''|n) 1224 echo '' 1225 echo " *** Cancelled" 1226 echo '' 1227 echo " Make sure to run ${1} yourself" 1228 ;; 1229 *) 1230 echo '' 1231 echo " *** Sorry, I do not understand your answer (${YES_OR_NO})" 1232 echo '' 1233 echo " Make sure to run ${1} yourself" 1234 esac 1235 ;; 1236 *) ;; 1237 esac 1238} 1239 1240case "${NEED_NEWALIASES}" in 1241'') ;; 1242*) 1243 echo '' 1244 if [ -n "${DESTDIR}" ]; then 1245 echo "*** You installed a new aliases file into ${DESTDIR}/etc/mail, but" 1246 echo " the newaliases command is limited to the directories configured" 1247 echo " in sendmail.cf. Make sure to create your aliases database by" 1248 echo " hand when your sendmail configuration is done." 1249 else 1250 echo "*** You installed a new aliases file, so make sure that you run" 1251 echo " '/usr/bin/newaliases' to rebuild your aliases database" 1252 run_it_now '/usr/bin/newaliases' 1253 fi 1254 ;; 1255esac 1256 1257case "${NEED_CAP_MKDB}" in 1258'') ;; 1259*) 1260 echo '' 1261 echo "*** You installed a login.conf file, so make sure that you run" 1262 echo " '/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf'" 1263 echo " to rebuild your login.conf database" 1264 run_it_now "/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf" 1265 ;; 1266esac 1267 1268case "${NEED_PWD_MKDB}" in 1269'') ;; 1270*) 1271 echo '' 1272 echo "*** You installed a new master.passwd file, so make sure that you run" 1273 if [ -n "${DESTDIR}" ]; then 1274 echo " '/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd'" 1275 echo " to rebuild your password files" 1276 run_it_now "/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd" 1277 else 1278 echo " '/usr/sbin/pwd_mkdb -p /etc/master.passwd'" 1279 echo " to rebuild your password files" 1280 run_it_now '/usr/sbin/pwd_mkdb -p /etc/master.passwd' 1281 fi 1282 ;; 1283esac 1284 1285echo '' 1286 1287if [ -r "${MM_EXIT_SCRIPT}" ]; then 1288 . "${MM_EXIT_SCRIPT}" 1289fi 1290 1291case "${COMP_CONFS}" in 1292'') ;; 1293*) 1294 . ${DESTDIR}/etc/defaults/rc.conf 1295 1296 (echo '' 1297 echo "*** Comparing conf files: ${rc_conf_files}" 1298 1299 for CONF_FILE in ${rc_conf_files}; do 1300 if [ -r "${DESTDIR}${CONF_FILE}" ]; then 1301 echo '' 1302 echo "*** From ${DESTDIR}${CONF_FILE}" 1303 echo "*** From ${DESTDIR}/etc/defaults/rc.conf" 1304 1305 for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} | 1306 cut -d '=' -f 1`; do 1307 echo '' 1308 grep -w ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE} 1309 grep -w ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf || 1310 echo ' * No default variable with this name' 1311 done 1312 fi 1313 done) | ${PAGER} 1314 echo '' 1315 ;; 1316esac 1317 1318case "${PRE_WORLD}" in 1319'') ;; 1320*) 1321 MAKE_CONF="${SOURCEDIR}/share/examples/etc/make.conf" 1322 1323 (echo '' 1324 echo '*** Comparing make variables' 1325 echo '' 1326 echo "*** From ${DESTDIR}/etc/make.conf" 1327 echo "*** From ${MAKE_CONF}" 1328 1329 for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`; do 1330 echo '' 1331 grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf 1332 grep -w ^#${MAKE_VAR} ${MAKE_CONF} || 1333 echo ' * No example variable with this name' 1334 done) | ${PAGER} 1335 ;; 1336esac 1337 1338if [ -n "${PRESERVE_FILES}" ]; then 1339 find -d $PRESERVE_FILES_DIR -type d -empty -delete 2>/dev/null 1340 rmdir $PRESERVE_FILES_DIR 2>/dev/null 1341fi 1342 1343exit 0 1344