Module Name: src
Committed By: christos
Date: Mon Aug 24 07:21:14 UTC 2015
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
handle blacklistd properly.
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 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.200 src/usr.sbin/postinstall/postinstall:1.201
--- src/usr.sbin/postinstall/postinstall:1.200 Fri Aug 21 08:02:07 2015
+++ src/usr.sbin/postinstall/postinstall Mon Aug 24 03:21:14 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.200 2015/08/21 12:02:07 jnemeth Exp $
+# $NetBSD: postinstall,v 1.201 2015/08/24 07:21:14 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1336,7 +1336,6 @@ accounting
altqd
amd
apmd
-blacklistd
bluetooth
bootconf.sh
bootparams
@@ -1507,6 +1506,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"
