[src/netbsd-3-0]: src/usr.sbin/etcupdate Pull up following revision(s) (reque...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9ec7e6e4084c
branches:  netbsd-3-0
changeset: 579386:9ec7e6e4084c
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Feb 19 22:22:15 2007 +0000

description:
Pull up following revision(s) (requested by martti in ticket #1666):
        usr.sbin/etcupdate/etcupdate: revision 1.31
Run pwd_mkdb before running mtree.
Reported by Hauke Fath in PR 35570.

diffstat:

 usr.sbin/etcupdate/etcupdate |  32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diffs (55 lines):

diff -r d480d35e5bf1 -r 9ec7e6e4084c usr.sbin/etcupdate/etcupdate
--- a/usr.sbin/etcupdate/etcupdate      Sun Feb 11 13:23:21 2007 +0000
+++ b/usr.sbin/etcupdate/etcupdate      Mon Feb 19 22:22:15 2007 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: etcupdate,v 1.21.6.1.2.1 2007/01/19 21:41:32 bouyer Exp $
+# $NetBSD: etcupdate,v 1.21.6.1.2.2 2007/02/19 22:22:15 tron Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -632,6 +632,21 @@
 fi
 
 # Do some post-installation tasks
+if ${NEED_PWD_MKDB}; then
+       if yesno "Do you want to rebuild the password databases from the" \
+                "new master.passwd"
+       then
+               verbose "Running pwd_mkdb"
+               pwd_mkdb -p "/etc/master.passwd"
+       else
+               echo ""
+               echo "*** You MUST rebuild the password databases to make" \
+                    "the changes visible"
+               echo "*** This is done by running \"pwd_mkdb -p" \
+                    "/etc/master.passwd\" as root"
+               echo ""
+       fi
+fi
 if ${NEED_MTREE}; then
        if yesno "You have created new directories. Run mtree to set" \
                 "permissions"
@@ -663,21 +678,6 @@
                echo ""
        fi
 fi
-if ${NEED_PWD_MKDB}; then
-       if yesno "Do you want to rebuild the password databases from the" \
-                "new master.passwd"
-       then
-               verbose "Running pwd_mkdb"
-               pwd_mkdb -p "/etc/master.passwd"
-       else
-               echo ""
-               echo "*** You MUST rebuild the password databases to make" \
-                    "the changes visible"
-               echo "*** This is done by running \"pwd_mkdb -p" \
-                    "/etc/master.passwd\" as root"
-               echo ""
-       fi
-fi
 if [ -x /usr/sbin/postinstall ] && ! ${BINARYMODE}; then
        # XXX we should also run postinstall in binary mode
        echo "*** Running /usr/sbin/postinstall"