Module Name: src
Committed By: christos
Date: Fri Aug 28 15:25:17 UTC 2020
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
Restrict npf.conf fixes to "blacklistd" -> "blocklistd"
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 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.31 src/usr.sbin/postinstall/postinstall.in:1.32
--- src/usr.sbin/postinstall/postinstall.in:1.31 Tue Jul 7 08:01:21 2020
+++ src/usr.sbin/postinstall/postinstall.in Fri Aug 28 11:25:16 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.31 2020/07/07 12:01:21 simonb Exp $
+# $NetBSD: postinstall.in,v 1.32 2020/08/28 15:25:16 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -859,7 +859,11 @@ fixblock() {
else
local p=$(${STAT} -f %Lp "${target}")
chmod u+w "${target}" || return 1
- ${SED} -i -e 's/\([bB]\)lack/\1lock/g' "${target}"
+ if [ "$2" = "/etc/npf.conf" ]; then
+ ${SED} -i -e 's/"blacklistd/"blocklistd"/g' "${target}"
+ else
+ ${SED} -i -e 's/\([bB]\)lacklist/\1locklist/g' "${target}"
+ fi
chmod "${p}" "${target}"
fi
fi
