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

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

details:   https://anonhg.NetBSD.org/src/rev/9c77caabb142
branches:  netbsd-7
changeset: 799581:9c77caabb142
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Sep 03 03:31:15 2015 +0000

description:
Pull up following revision(s) (requested by snj in ticket #968):
        usr.sbin/postinstall/postinstall: revision 1.201
handle blacklistd properly.

diffstat:

 usr.sbin/postinstall/postinstall |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 479585cb4b3f -r 9c77caabb142 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Mon Aug 31 01:59:37 2015 +0000
+++ b/usr.sbin/postinstall/postinstall  Thu Sep 03 03:31:15 2015 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.175.2.9 2015/08/21 17:27:16 snj Exp $
+# $NetBSD: postinstall,v 1.175.2.10 2015/09/03 03:31:15 riz Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1338,7 +1338,7 @@
 
        compare_dir "${op}" "${SRC_DIR}/etc/rc.d" "${DEST_DIR}/etc/rc.d" 555 \
                DAEMON DISKS LOGIN NETWORKING SERVERS \
-               accounting altqd amd apmd blacklistd \
+               accounting altqd amd apmd \
                bluetooth bootconf.sh bootparams \
                ccd cgd cleartmp cron devpubd \
                dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \
@@ -1366,6 +1366,16 @@
                ${extra_scripts}
        failed=$(( ${failed} + $? ))
 
+       if ! find_file_in_dirlist blacklistd "blacklistd" \
+           "${SRC_DIR}/external/bsd/blacklist/etc/rc.d" \
+           "${SRC_DIR}/etc/rc.d"; then
+           failed=1
+       else
+           populate_dir "$op" true "${dir}" "${DEST_DIR}/etc/rc.d" 555 \
+               blacklistd
+           failed=$(( ${failed} + $? ))
+       fi
+
        if $SOURCEMODE && [ -n "${generated_scripts}" ]; then
                # generate scripts
                mkdir "${SCRATCHDIR}/rc"