The location of the pkg_info binary can now be specified in /etc/security.conf.

The default remains as /usr/sbin/pkg_info.  This should fix PR# 36746.
This commit is contained in:
adrianp 2007-08-27 19:57:02 +00:00
parent 34bea28655
commit 67b08a07ec
2 changed files with 5 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: security.conf,v 1.19 2007/08/05 00:10:37 jnemeth Exp $
# $NetBSD: security.conf,v 1.20 2007/08/27 19:57:02 adrianp Exp $
#
# /etc/defaults/security.conf --
# default configuration of /etc/security.conf
@ -28,6 +28,7 @@ backup_dir=/var/backups
backup_uses_rcs=YES
diff_options=-u
pkgdb_dir=/var/db/pkg
pkg_info=/usr/sbin/pkg_info
check_homes_permit_usergroups=NO

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $NetBSD: security,v 1.103 2007/08/09 07:50:58 tron Exp $
# $NetBSD: security,v 1.104 2007/08/27 19:57:02 adrianp Exp $
# from: @(#)security 8.1 (Berkeley) 6/9/93
#
@ -28,6 +28,7 @@ backup_dir=${backup_dir:-/var/backups}
pkgdb_dir=${pkgdb_dir:-/var/db/pkg}
max_loginlen=${max_loginlen:-8}
max_grouplen=${max_grouplen:-8}
pkg_info=${pkg_info:-/usr/sbin/pkg_info}
# Other configurable variables
#
@ -888,7 +889,7 @@ if checkyesno check_pkgs && [ -d $pkgdb_dir ]; then
pkgs=$work_dir/pkgs
migrate_file "$backup_dir/pkgs" "$pkgs"
( cd $pkgdb_dir
pkg_info | sort
$pkg_info | sort
echo ""
find . \( -name +REQUIRED_BY -o -name +CONTENTS \) -print0 |
xargs -0 ls -ldgTq | sort -t. +1 | sed -e 's, \./, ,'