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

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

details:   https://anonhg.NetBSD.org/src/rev/97eeaccc69b2
branches:  netbsd-3
changeset: 577104:97eeaccc69b2
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Sep 04 13:43:59 2005 +0000

description:
Pull up following revision(s) (requested by lukem in ticket #745):
        usr.sbin/postinstall/postinstall: revision 1.5
Fix the installation of /etc/defaults/pf.boot.conf so that it works
with -s etc.tgz.

diffstat:

 usr.sbin/postinstall/postinstall |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r f808a5419945 -r 97eeaccc69b2 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Sat Sep 03 07:06:45 2005 +0000
+++ b/usr.sbin/postinstall/postinstall  Sun Sep 04 13:43:59 2005 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.2.2.5 2005/09/02 12:29:37 tron Exp $
+# $NetBSD: postinstall,v 1.2.2.6 2005/09/04 13:43:59 tron Exp $
 #
 # Copyright (c) 2002-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -500,8 +500,11 @@
        compare_dir $1 ${SRC_DIR}/etc/defaults ${DEST_DIR}/etc/defaults 444 \
                daily.conf monthly.conf rc.conf security.conf weekly.conf
 
-       compare_dir $1 ${SRC_DIR}/usr.sbin/pf/etc/defaults \
-               ${DEST_DIR}/etc/defaults 444 pf.boot.conf
+       find_file_in_dirlist pf.boot.conf "pf.boot.conf" \
+           ${SRC_DIR}/usr.sbin/pf/etc/defaults ${SRC_DIR}/etc/defaults \
+           || return 1
+
+       compare_dir $1 ${dir} ${DEST_DIR}/etc/defaults 444 pf.boot.conf
 }
 
 #