Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/postinstall Restrict npf.conf fixes to "blacklistd"...



details:   https://anonhg.NetBSD.org/src/rev/203eb54a775d
branches:  trunk
changeset: 937891:203eb54a775d
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Aug 28 15:25:16 2020 +0000

description:
Restrict npf.conf fixes to "blacklistd" -> "blocklistd"

diffstat:

 usr.sbin/postinstall/postinstall.in |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 67c96eb98d0d -r 203eb54a775d usr.sbin/postinstall/postinstall.in
--- a/usr.sbin/postinstall/postinstall.in       Fri Aug 28 14:58:25 2020 +0000
+++ b/usr.sbin/postinstall/postinstall.in       Fri Aug 28 15:25:16 2020 +0000
@@ -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 @@
                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



Home | Main Index | Thread Index | Old Index