Module Name: src
Committed By: martin
Date: Thu Oct 31 18:44:45 UTC 2024
Modified Files:
src/usr.sbin/postinstall [netbsd-10]: postinstall.in
Log Message:
Pull up following revision(s) (requested by spz in ticket #992):
usr.sbin/postinstall/postinstall.in: revision 1.68
usr.sbin/postinstall/postinstall.in: revision 1.71
(typo) it used to be /var/db/blacklistd.db not /var/db/blacklist.db
PR bin/58476: second half: be more selective with the strings to update
for blacklistd -> blocklistd
issue pointed out and patch supplied by Timo Buhrmester
To generate a diff of this commit:
cvs rdiff -u -r1.51.2.3 -r1.51.2.4 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.51.2.3 src/usr.sbin/postinstall/postinstall.in:1.51.2.4
--- src/usr.sbin/postinstall/postinstall.in:1.51.2.3 Mon Mar 11 17:25:20 2024
+++ src/usr.sbin/postinstall/postinstall.in Thu Oct 31 18:44:45 2024
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.51.2.3 2024/03/11 17:25:20 martin Exp $
+# $NetBSD: postinstall.in,v 1.51.2.4 2024/10/31 18:44:45 martin Exp $
#
# Copyright (c) 2002-2022 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -941,7 +941,7 @@ fixblock()
continue
fi
- if ${GREP} '[bB]lack' "${target}" > /dev/null; then
+ if ${GREP} '[bB]lacklist' "${target}" > /dev/null; then
if [ "$1" = "check" ]; then
msg "Fix old configuration file(s)."
return 1
@@ -966,7 +966,7 @@ do_blocklist()
local i old
# if we are actually using blocklistd
- for i in /var/db/blacklist.db /etc/blacklistd.conf; do
+ for i in /var/db/blacklistd.db /etc/blacklistd.conf; do
old="${DEST_DIR}${i}"
if [ ! -f "${old}" ]; then
continue
@@ -974,7 +974,7 @@ do_blocklist()
msg "Rename old file(s)."
return 1
fi
- local new=$(echo "${old}" | ${SED} s/black/block/)
+ local new=$(echo "${old}" | ${SED} s/blacklist/blocklist/)
mv "${old}" "${new}" || return 1
done
