| @@ -1,16 +1,16 @@ | | | @@ -1,16 +1,16 @@ |
1 | #!/bin/sh | | 1 | #!/bin/sh |
2 | # | | 2 | # |
3 | # $NetBSD: etcupdate,v 1.47 2008/10/04 08:07:38 apb Exp $ | | 3 | # $NetBSD: etcupdate,v 1.48 2008/10/22 15:20:05 apb Exp $ |
4 | # | | 4 | # |
5 | # Copyright (c) 2001-2008 The NetBSD Foundation, Inc. | | 5 | # Copyright (c) 2001-2008 The NetBSD Foundation, Inc. |
6 | # All rights reserved. | | 6 | # All rights reserved. |
7 | # | | 7 | # |
8 | # This code is derived from software contributed to The NetBSD Foundation | | 8 | # This code is derived from software contributed to The NetBSD Foundation |
9 | # by Martti Kuparinen. | | 9 | # by Martti Kuparinen. |
10 | # | | 10 | # |
11 | # Redistribution and use in source and binary forms, with or without | | 11 | # Redistribution and use in source and binary forms, with or without |
12 | # modification, are permitted provided that the following conditions | | 12 | # modification, are permitted provided that the following conditions |
13 | # are met: | | 13 | # are met: |
14 | # 1. Redistributions of source code must retain the above copyright | | 14 | # 1. Redistributions of source code must retain the above copyright |
15 | # notice, this list of conditions and the following disclaimer. | | 15 | # notice, this list of conditions and the following disclaimer. |
16 | # 2. Redistributions in binary form must reproduce the above copyright | | 16 | # 2. Redistributions in binary form must reproduce the above copyright |
| @@ -631,29 +631,29 @@ fi | | | @@ -631,29 +631,29 @@ fi |
631 | if yesno "Remove ${TEMPROOT}"; then | | 631 | if yesno "Remove ${TEMPROOT}"; then |
632 | echo "*** Removing ${TEMPROOT}" | | 632 | echo "*** Removing ${TEMPROOT}" |
633 | rm -rf "${TEMPROOT}" | | 633 | rm -rf "${TEMPROOT}" |
634 | else | | 634 | else |
635 | echo "*** Keeping ${TEMPROOT}" | | 635 | echo "*** Keeping ${TEMPROOT}" |
636 | fi | | 636 | fi |
637 | | | 637 | |
638 | # Clean up after "make distribution" | | 638 | # Clean up after "make distribution" |
639 | if ${SOURCEMODE}; then | | 639 | if ${SOURCEMODE}; then |
640 | echo "*** Cleaning up in ${SRCDIR}/etc" | | 640 | echo "*** Cleaning up in ${SRCDIR}/etc" |
641 | set_makeenv | | 641 | set_makeenv |
642 | cd ${SRCDIR}/etc | | 642 | cd ${SRCDIR}/etc |
643 | if ! ${VERBOSE}; then | | 643 | if ! ${VERBOSE}; then |
644 | "eval ${MAKE_ENV} make clean > /dev/null" | | 644 | eval "${MAKE_ENV} make clean > /dev/null" |
645 | else | | 645 | else |
646 | "eval ${MAKE_ENV} make clean" | | 646 | eval "${MAKE_ENV} make clean" |
647 | fi | | 647 | fi |
648 | fi | | 648 | fi |
649 | | | 649 | |
650 | # Do some post-installation tasks | | 650 | # Do some post-installation tasks |
651 | if ${NEED_PWD_MKDB}; then | | 651 | if ${NEED_PWD_MKDB}; then |
652 | if yesno "Do you want to rebuild the password databases from the" \ | | 652 | if yesno "Do you want to rebuild the password databases from the" \ |
653 | "new master.passwd" | | 653 | "new master.passwd" |
654 | then | | 654 | then |
655 | verbose "Running pwd_mkdb" | | 655 | verbose "Running pwd_mkdb" |
656 | pwd_mkdb -p "/etc/master.passwd" | | 656 | pwd_mkdb -p "/etc/master.passwd" |
657 | else | | 657 | else |
658 | echo "" | | 658 | echo "" |
659 | echo "*** You MUST rebuild the password databases to make" \ | | 659 | echo "*** You MUST rebuild the password databases to make" \ |