Module Name: src
Committed By: riz
Date: Thu Sep 3 03:31:15 UTC 2015
Modified Files:
src/usr.sbin/postinstall [netbsd-7]: postinstall
Log Message:
Pull up following revision(s) (requested by snj in ticket #968):
usr.sbin/postinstall/postinstall: revision 1.201
handle blacklistd properly.
To generate a diff of this commit:
cvs rdiff -u -r1.175.2.9 -r1.175.2.10 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.175.2.9 src/usr.sbin/postinstall/postinstall:1.175.2.10
--- src/usr.sbin/postinstall/postinstall:1.175.2.9 Fri Aug 21 17:27:16 2015
+++ src/usr.sbin/postinstall/postinstall Thu Sep 3 03:31:15 2015
@@ -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 @@ do_rc()
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 @@ do_rc()
${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"
