mergemaster.sh revision 193853
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 193853 2009-06-09 20:20:08Z 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:-/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` 348fi 349 350# Check for the mtree database in DESTDIR 351case "${AUTO_UPGRADE}" in 352'') ;; # If the option is not set no need to run the test or warn the user 353*) 354 if [ ! -s "${DESTDIR}${MTREEFILE}" ]; then 355 echo '' 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." 358 echo '' 359 press_to_continue 360 unset AUTO_UPGRADE 361 fi 362 ;; 363esac 364 365if [ -e "${DESTDIR}/etc/fstab" ]; then 366 if grep -q nodev ${DESTDIR}/etc/fstab; then 367 echo '' 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." 372 echo '' 373 exit 1 374 fi 375fi 376 377echo '' 378 379# If the user has a pager defined, make sure we can run it 380# 381case "${DONT_CHECK_PAGER}" in 382'') 383check_pager () { 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?" 388 echo '' 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" 392 fi 393 echo " Use 'm' to use plain old 'more' as your PAGER for this run" 394 echo '' 395 echo " Default is to use plain old 'more' " 396 echo '' 397 echo -n "What should I do? [Use 'more'] " 398 read FIXPAGER 399 400 case "${FIXPAGER}" in 401 [eE]) 402 exit 0 403 ;; 404 [lL]) 405 if [ -x /usr/bin/less ]; then 406 PAGER=/usr/bin/less 407 elif [ -x /usr/local/bin/less ]; then 408 PAGER=/usr/local/bin/less 409 else 410 echo '' 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" 414 exit 1 415 fi 416 ;; 417 [mM]|'') 418 PAGER=more 419 ;; 420 *) 421 echo '' 422 echo "invalid choice: ${FIXPAGER}" 423 esac 424 echo '' 425 done 426} 427 if [ -n "${PAGER}" ]; then 428 check_pager 429 fi 430 ;; 431esac 432 433# If user has a pager defined, or got assigned one above, use it. 434# If not, use more. 435# 436PAGER=${PAGER:-more} 437 438if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then 439 echo " *** You have ${PAGER} defined as your pager so we will use that" 440 echo '' 441 sleep 3 442fi 443 444# Assign the diff flag once so we will not have to keep testing it 445# 446DIFF_FLAG=${DIFF_FLAG:--u} 447 448# Assign the source directory 449# 450SOURCEDIR=${SOURCEDIR:-/usr/src} 451if [ ! -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}/.." 455 echo '' 456 sleep 3 457 SOURCEDIR=${SOURCEDIR}/.. 458fi 459 460# Setup make to use system files from SOURCEDIR 461MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" 462 463# Check DESTDIR against the mergemaster mtree database to see what 464# files the user changed from the reference files. 465# 466if [ -n "${AUTO_UPGRADE}" -a -s "${DESTDIR}${MTREEFILE}" ]; then 467 CHANGED=: 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}:" 472 fi 473 done 474 [ "$CHANGED" = ':' ] && unset CHANGED 475fi 476 477# Check the width of the user's terminal 478# 479if [ -t 0 ]; then 480 w=`tput columns` 481 case "${w}" in 482 0|'') ;; # No-op, since the input is not valid 483 *) 484 case "${SCREEN_WIDTH}" in 485 '') SCREEN_WIDTH="${w}" ;; 486 "${w}") ;; # No-op, since they are the same 487 *) 488 echo -n "*** You entered ${SCREEN_WIDTH} as your screen width, but stty " 489 echo "thinks it is ${w}." 490 echo '' 491 echo -n "What would you like to use? [${w}] " 492 read SCREEN_WIDTH 493 case "${SCREEN_WIDTH}" in 494 '') SCREEN_WIDTH="${w}" ;; 495 esac 496 ;; 497 esac 498 esac 499fi 500 501# Define what CVS $Id tag to look for to aid portability. 502# 503CVS_ID_TAG=FreeBSD 504 505delete_temproot () { 506 rm -rf "${TEMPROOT}" 2>/dev/null 507 chflags -R 0 "${TEMPROOT}" 2>/dev/null 508 rm -rf "${TEMPROOT}" || exit 1 509} 510 511case "${RERUN}" in 512'') 513 # Set up the loop to test for the existence of the 514 # temp root directory. 515 # 516 TEST_TEMP_ROOT=yes 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." 522 echo '' 523 case "${AUTO_RUN}" in 524 '') 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" 528 echo '' 529 echo " Default is to use ${TEMPROOT} as is" 530 echo '' 531 echo -n "How should I deal with this? [Use the existing ${TEMPROOT}] " 532 read DELORNOT 533 534 case "${DELORNOT}" in 535 [dD]) 536 echo '' 537 echo " *** Deleting the old ${TEMPROOT}" 538 echo '' 539 delete_temproot || exit 1 540 unset TEST_TEMP_ROOT 541 ;; 542 [tT]) 543 echo " *** Enter new directory name for temporary root environment" 544 read TEMPROOT 545 ;; 546 [eE]) 547 exit 0 548 ;; 549 '') 550 echo '' 551 echo " *** Leaving ${TEMPROOT} intact" 552 echo '' 553 unset TEST_TEMP_ROOT 554 ;; 555 *) 556 echo '' 557 echo "invalid choice: ${DELORNOT}" 558 echo '' 559 ;; 560 esac 561 ;; 562 *) 563 # If this is an auto-run, try a hopefully safe alternative then 564 # re-test anyway. 565 TEMPROOT=/var/tmp/temproot.`date +%m%d.%H.%M.%S` 566 ;; 567 esac 568 else 569 unset TEST_TEMP_ROOT 570 fi 571 done 572 573 echo "*** Creating the temporary root environment in ${TEMPROOT}" 574 575 if mkdir -p "${TEMPROOT}"; then 576 echo " *** ${TEMPROOT} ready for use" 577 fi 578 579 if [ ! -d "${TEMPROOT}" ]; then 580 echo '' 581 echo " *** FATAL ERROR: Cannot create ${TEMPROOT}" 582 echo '' 583 exit 1 584 fi 585 586 echo " *** Creating and populating directory structure in ${TEMPROOT}" 587 echo '' 588 589 case "${VERBOSE}" in 590 '') ;; 591 *) 592 press_to_continue 593 ;; 594 esac 595 596 case "${PRE_WORLD}" in 597 '') 598 { cd ${SOURCEDIR} && 599 case "${DESTDIR}" in 600 '') ;; 601 *) 602 ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs 603 ;; 604 esac 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;} || 610 { echo ''; 611 echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; 612 echo " the temproot environment"; 613 echo ''; 614 exit 1;} 615 ;; 616 *) 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;} || 621 { echo ''; 622 echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; 623 echo ''; 624 exit 1;} 625 ;; 626 esac 627 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. 631 case "${VERBOSE}" in 632 '') ;; 633 *) 634 echo '' 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.' 640 echo '' 641 press_to_continue 642 diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER} 643 echo '' 644 press_to_continue 645 ;; 646 esac 647 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 651 '') ;; 652 *) IGNORE_FILES="${IGNORE_FILES} /etc/motd" 653 echo '' 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." 657 echo '' 658 press_to_continue 659 ;; 660 esac 661 662 # Avoid comparing the following user specified files 663 for file in ${IGNORE_FILES}; do 664 test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file} 665 done 666 ;; # End of the "RERUN" test 667esac 668 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. 672# 673rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd 674 675# We only need to compare things like freebsd.cf once 676find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null 677 678# Delete stuff we do not need to keep the mtree database small, 679# and to make the actual comparison faster. 680find ${TEMPROOT}/usr -type l -delete 2>/dev/null 681find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null 682find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null 683 684# Build the mtree database in a temporary location. 685MTREENEW=`mktemp -t mergemaster.mtree` 686case "${PRE_WORLD}" in 687'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null 688 ;; 689*) # We don't want to mess with the mtree database on a pre-world run. 690 ;; 691esac 692 693# Get ready to start comparing files 694 695# Check umask if not specified on the command line, 696# and we are not doing an autorun 697# 698if [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN}" ]; then 699 USER_UMASK=`umask` 700 case "${USER_UMASK}" in 701 0022|022) ;; 702 *) 703 echo '' 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." 709 echo '' 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." 714 echo '' 715 echo -n "What umask should I use? [${USER_UMASK}] " 716 read NEW_UMASK 717 718 NEW_UMASK="${NEW_UMASK:-$USER_UMASK}" 719 ;; 720 esac 721 echo '' 722fi 723 724CONFIRMED_UMASK=${NEW_UMASK:-0022} 725 726# 727# Warn users who still have old rc files 728# 729for 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 732 OLD_RC_PRESENT=1 733 break 734 fi 735done 736 737case "${OLD_RC_PRESENT}" in 7381) 739 echo '' 740 echo " *** There are elements of the old rc system in ${DESTDIR}/etc/." 741 echo '' 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.' 744 echo '' 745 746 case "${AUTO_RUN}" in 747 '') 748 echo -n 'Move these files to /var/tmp/mergemaster/old_rc? [yes] ' 749 read MOVE_OLD_RC 750 751 case "${MOVE_OLD_RC}" in 752 [nN]*) ;; 753 *) 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/ 759 fi 760 done 761 echo ' The files have been moved' 762 press_to_continue 763 ;; 764 esac 765 ;; 766 *) ;; 767 esac 768esac 769 770# Use the umask/mode information to install the files 771# Create directories as needed 772# 773install_error () { 774 echo "*** FATAL ERROR: Unable to install ${1} to ${2}" 775 echo '' 776 exit 1 777} 778 779do_install_and_rm () { 780 case "${PRESERVE_FILES}" in 781 [Yy][Ee][Ss]) 782 if [ -f "${3}/${2##*/}" ]; then 783 mkdir -p ${PRESERVE_FILES_DIR}/${2%/*} 784 cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*} 785 fi 786 ;; 787 esac 788 789 if [ ! -d "${3}/${2##*/}" ]; then 790 if install -m ${1} ${2} ${3}; then 791 unlink ${2} 792 else 793 install_error ${2} ${3} 794 fi 795 else 796 install_error ${2} ${3} 797 fi 798} 799 800# 4095 = "obase=10;ibase=8;07777" | bc 801find_mode () { 802 local OCTAL 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} 806} 807 808mm_install () { 809 local INSTALL_DIR 810 INSTALL_DIR=${1#.} 811 INSTALL_DIR=${INSTALL_DIR%/*} 812 813 case "${INSTALL_DIR}" in 814 '') 815 INSTALL_DIR=/ 816 ;; 817 esac 818 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}" 822 fi 823 824 FILE_MODE=`find_mode "${1}"` 825 826 if [ ! -x "${1}" ]; then 827 case "${1#.}" in 828 /etc/mail/aliases) 829 NEED_NEWALIASES=yes 830 ;; 831 /etc/login.conf) 832 NEED_CAP_MKDB=yes 833 ;; 834 /etc/master.passwd) 835 do_install_and_rm 600 "${1}" "${DESTDIR}${INSTALL_DIR}" 836 NEED_PWD_MKDB=yes 837 DONT_INSTALL=yes 838 ;; 839 /.cshrc | /.profile) 840 case "${AUTO_INSTALL}" in 841 '') 842 case "${LINK_EXPLAINED}" in 843 '') 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." 849 echo '' 850 LINK_EXPLAINED=yes 851 ;; 852 esac 853 854 echo " Use 'd' to delete the temporary ${COMPFILE}" 855 echo " Use 'l' to delete the existing ${DESTDIR}${COMPFILE#.} and create the link" 856 echo '' 857 echo " Default is to leave the temporary file to deal with by hand" 858 echo '' 859 echo -n " How should I handle ${COMPFILE}? [Leave it to install later] " 860 read HANDLE_LINK 861 ;; 862 *) # Part of AUTO_INSTALL 863 HANDLE_LINK=l 864 ;; 865 esac 866 867 case "${HANDLE_LINK}" in 868 [dD]*) 869 rm "${COMPFILE}" 870 echo '' 871 echo " *** Deleting ${COMPFILE}" 872 ;; 873 [lL]*) 874 echo '' 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" 878 rm "${COMPFILE}" 879 else 880 echo " *** Error linking ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/}, ${COMPFILE} will remain to install by hand" 881 fi 882 ;; 883 *) 884 echo " *** ${COMPFILE} will remain for your consideration" 885 ;; 886 esac 887 DONT_INSTALL=yes 888 ;; 889 esac 890 891 case "${DONT_INSTALL}" in 892 '') 893 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 894 ;; 895 *) 896 unset DONT_INSTALL 897 ;; 898 esac 899 else # File matched -x 900 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 901 fi 902 return $? 903} 904 905if [ ! -d "${TEMPROOT}" ]; then 906 echo "*** FATAL ERROR: The temproot directory (${TEMPROOT})" 907 echo ' has disappeared!' 908 echo '' 909 exit 1 910fi 911 912echo '' 913echo "*** Beginning comparison" 914echo '' 915 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. 919if [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then 920 echo " *** Checking ${DESTDIR}/etc/rc.d for stale files" 921 echo '' 922 cd "${DESTDIR}/etc/rc.d" && 923 for file in *; do 924 if [ ! -e "${TEMPROOT}/etc/rc.d/${file}" ]; then 925 STALE_RC_FILES="${STALE_RC_FILES} ${file}" 926 fi 927 done 928 case "${STALE_RC_FILES}" in 929 ''|' *') 930 echo ' *** No stale files found' 931 ;; 932 *) 933 echo " *** The following files exist in ${DESTDIR}/etc/rc.d but not in" 934 echo " ${TEMPROOT}/etc/rc.d/:" 935 echo '' 936 echo "${STALE_RC_FILES}" 937 echo '' 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 942 '') 943 echo '' 944 echo -n ' *** Delete them now? [n] ' 945 read DELETE_STALE_RC_FILES 946 case "${DELETE_STALE_RC_FILES}" in 947 [yY]) 948 echo ' *** Deleting ... ' 949 rm ${STALE_RC_FILES} 950 echo ' done.' 951 ;; 952 *) 953 echo ' *** Files will not be deleted' 954 ;; 955 esac 956 sleep 2 957 ;; 958 esac 959 ;; 960 esac 961 echo '' 962fi 963 964cd "${TEMPROOT}" 965 966if [ -r "${MM_PRE_COMPARE_SCRIPT}" ]; then 967 . "${MM_PRE_COMPARE_SCRIPT}" 968fi 969 970for COMPFILE in `find . -type f`; do 971 972 # First, check to see if the file exists in DESTDIR. If not, the 973 # diff_loop function knows how to handle it. 974 # 975 if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then 976 case "${AUTO_RUN}" in 977 '') 978 diff_loop 979 ;; 980 *) 981 case "${AUTO_INSTALL}" in 982 '') 983 # If this is an auto run, make it official 984 echo " *** ${COMPFILE} will remain for your consideration" 985 ;; 986 *) 987 diff_loop 988 ;; 989 esac 990 ;; 991 esac # Auto run test 992 continue 993 fi 994 995 case "${STRICT}" in 996 '' | [Nn][Oo]) 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. 1001 # 1002 CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` 1003 CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID2=none 1004 1005 case "${CVSID2}" in 1006 "${CVSID1}") 1007 echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting" 1008 rm "${COMPFILE}" 1009 ;; 1010 esac 1011 ;; 1012 esac 1013 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. 1016 # 1017 if [ -f "${COMPFILE}" ]; then 1018 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. 1021 # 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" 1025 rm "${COMPFILE}" 1026 else 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. 1029 # Use more if not. 1030 # Use unified diffs by default. Context diffs give me a headache. :) 1031 # 1032 # If the user chose the -F option, test for that before proceeding 1033 # 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#.}" 1039 else 1040 echo "*** Problem installing ${COMPFILE}, it will remain to merge by hand later" 1041 fi 1042 continue 1043 fi 1044 fi 1045 case "${AUTO_RUN}" in 1046 '') 1047 # prompt user to install/delete/merge changes 1048 diff_loop 1049 ;; 1050 *) 1051 # If this is an auto run, make it official 1052 echo " *** ${COMPFILE} will remain for your consideration" 1053 ;; 1054 esac # Auto run test 1055 fi # Yes, the files are different 1056 fi # Yes, the file still remains to be checked 1057done # This is for the for way up there at the beginning of the comparison 1058 1059echo '' 1060echo "*** Comparison complete" 1061 1062if [ -s "${MTREENEW}" ]; then 1063 echo "*** Saving mtree database for future upgrades" 1064 test -e "${DESTDIR}${MTREEFILE}" && unlink ${DESTDIR}${MTREEFILE} 1065 mv ${MTREENEW} ${DESTDIR}${MTREEFILE} 1066fi 1067 1068echo '' 1069 1070TEST_FOR_FILES=`find ${TEMPROOT} -type f -size +0 2>/dev/null` 1071if [ -n "${TEST_FOR_FILES}" ]; then 1072 echo "*** Files that remain for you to merge by hand:" 1073 find "${TEMPROOT}" -type f -size +0 1074 echo '' 1075fi 1076 1077case "${AUTO_RUN}" in 1078'') 1079 echo -n "Do you wish to delete what is left of ${TEMPROOT}? [no] " 1080 read DEL_TEMPROOT 1081 1082 case "${DEL_TEMPROOT}" in 1083 [yY]*) 1084 if delete_temproot; then 1085 echo " *** ${TEMPROOT} has been deleted" 1086 else 1087 echo " *** Unable to delete ${TEMPROOT}" 1088 fi 1089 ;; 1090 *) 1091 echo " *** ${TEMPROOT} will remain" 1092 ;; 1093 esac 1094 ;; 1095*) ;; 1096esac 1097 1098case "${AUTO_INSTALLED_FILES}" in 1099'') ;; 1100*) 1101 case "${AUTO_RUN}" in 1102 '') 1103 ( 1104 echo '' 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}" 1108 ) | ${PAGER} 1109 ;; 1110 *) 1111 echo '' 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}" 1115 ;; 1116 esac 1117 ;; 1118esac 1119 1120case "${AUTO_UPGRADED_FILES}" in 1121'') ;; 1122*) 1123 case "${AUTO_RUN}" in 1124 '') 1125 ( 1126 echo '' 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}" 1130 ) | ${PAGER} 1131 ;; 1132 *) 1133 echo '' 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}" 1137 ;; 1138 esac 1139 ;; 1140esac 1141 1142run_it_now () { 1143 case "${AUTO_RUN}" in 1144 '') 1145 unset YES_OR_NO 1146 echo '' 1147 echo -n ' Would you like to run it now? y or n [n] ' 1148 read YES_OR_NO 1149 1150 case "${YES_OR_NO}" in 1151 y) 1152 echo " Running ${1}" 1153 echo '' 1154 eval "${1}" 1155 ;; 1156 ''|n) 1157 echo '' 1158 echo " *** Cancelled" 1159 echo '' 1160 echo " Make sure to run ${1} yourself" 1161 ;; 1162 *) 1163 echo '' 1164 echo " *** Sorry, I do not understand your answer (${YES_OR_NO})" 1165 echo '' 1166 echo " Make sure to run ${1} yourself" 1167 esac 1168 ;; 1169 *) ;; 1170 esac 1171} 1172 1173case "${NEED_NEWALIASES}" in 1174'') ;; 1175*) 1176 echo '' 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." 1182 else 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' 1186 fi 1187 ;; 1188esac 1189 1190case "${NEED_CAP_MKDB}" in 1191'') ;; 1192*) 1193 echo '' 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" 1198 ;; 1199esac 1200 1201case "${NEED_PWD_MKDB}" in 1202'') ;; 1203*) 1204 echo '' 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" 1210 else 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' 1214 fi 1215 ;; 1216esac 1217 1218echo '' 1219 1220if [ -r "${MM_EXIT_SCRIPT}" ]; then 1221 . "${MM_EXIT_SCRIPT}" 1222fi 1223 1224case "${COMP_CONFS}" in 1225'') ;; 1226*) 1227 . ${DESTDIR}/etc/defaults/rc.conf 1228 1229 (echo '' 1230 echo "*** Comparing conf files: ${rc_conf_files}" 1231 1232 for CONF_FILE in ${rc_conf_files}; do 1233 if [ -r "${DESTDIR}${CONF_FILE}" ]; then 1234 echo '' 1235 echo "*** From ${DESTDIR}${CONF_FILE}" 1236 echo "*** From ${DESTDIR}/etc/defaults/rc.conf" 1237 1238 for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} | 1239 cut -d '=' -f 1`; do 1240 echo '' 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' 1244 done 1245 fi 1246 done) | ${PAGER} 1247 echo '' 1248 ;; 1249esac 1250 1251case "${PRE_WORLD}" in 1252'') ;; 1253*) 1254 MAKE_CONF="${SOURCEDIR}/share/examples/etc/make.conf" 1255 1256 (echo '' 1257 echo '*** Comparing make variables' 1258 echo '' 1259 echo "*** From ${DESTDIR}/etc/make.conf" 1260 echo "*** From ${MAKE_CONF}" 1261 1262 for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`; do 1263 echo '' 1264 grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf 1265 grep -w ^#${MAKE_VAR} ${MAKE_CONF} || 1266 echo ' * No example variable with this name' 1267 done) | ${PAGER} 1268 ;; 1269esac 1270 1271exit 0 1272 1273