Module Name: src
Committed By: christos
Date: Mon Jun 15 21:56:50 UTC 2020
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
handle /etc/blacklistd.conf
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/postinstall/postinstall.in
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.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.26 src/usr.sbin/postinstall/postinstall.in:1.27
--- src/usr.sbin/postinstall/postinstall.in:1.26 Mon Jun 15 17:51:13 2020
+++ src/usr.sbin/postinstall/postinstall.in Mon Jun 15 17:56:49 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.26 2020/06/15 21:51:13 christos Exp $
+# $NetBSD: postinstall.in,v 1.27 2020/06/15 21:56:49 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -851,7 +851,7 @@ fixblock() {
fi
local p=$(stat -f %Lp "$i")
chmod u+w "$i"
- sed -i -e s/black/block/g "$i"
+ sed -i -e 's/\([bB]\)lack/\1lock/g' "$i"
chmod "$p" "$i"
done
}
@@ -868,6 +868,10 @@ do_blocklist()
if [ -f /var/db/blacklist.db ]; then
mv /var/db/blacklist.db /var/db/blocklist.db
fi
+ if [ -f /etc/blacklistd.conf ]; then
+ mv /etc/blacklistd.conf /etc/blocklistd.conf
+ fixblock /etc/blocklistd.conf
+ fi
# if we have fixed the rc files we are done
if ! grep -qs $rcfiles; then
