From 8c4fc91c362c75a63162c165ad853df5a094e411 Mon Sep 17 00:00:00 2001 From: lukem Date: Wed, 3 Oct 2001 15:41:25 +0000 Subject: [PATCH] replace "pkg_dbdir" with "pkgdb_dir", to be consistent with "backup_dir" --- etc/defaults/security.conf | 4 ++-- etc/security | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/defaults/security.conf b/etc/defaults/security.conf index 523ecf175d38..8e8790d92589 100644 --- a/etc/defaults/security.conf +++ b/etc/defaults/security.conf @@ -1,4 +1,4 @@ -# $NetBSD: security.conf,v 1.7 2001/10/01 02:21:20 atatat Exp $ +# $NetBSD: security.conf,v 1.8 2001/10/03 15:41:26 lukem Exp $ # # /etc/defaults/security.conf -- # default configuration of /etc/security.conf @@ -26,7 +26,7 @@ check_changelist=YES backup_dir=/var/backups backup_uses_rcs=YES -pkg_dbdir=/var/db/pkg +pkgdb_dir=/var/db/pkg max_loginlen=8 max_grouplen=8 diff --git a/etc/security b/etc/security index 3e675c1f2cd6..fcab0e4a2a0b 100644 --- a/etc/security +++ b/etc/security @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: security,v 1.64 2001/10/03 07:04:32 cjs Exp $ +# $NetBSD: security,v 1.65 2001/10/03 15:41:25 lukem Exp $ # from: @(#)security 8.1 (Berkeley) 6/9/93 # @@ -50,7 +50,7 @@ PKGS=secure9.$$ # Handle backup_dir not being set in .conf file backup_dir=${backup_dir:-/var/backups} CHANGELIST="" -pkg_dbdir=${pkg_dbdir:-/var/db/pkg} +pkgdb_dir=${pkgdb_dir:-/var/db/pkg} MP=/etc/master.passwd @@ -680,9 +680,9 @@ fi # Check for changes in the list of installed pkgs # -if checkyesno check_pkgs && [ -d $pkg_dbdir ]; then +if checkyesno check_pkgs && [ -d $pkgdb_dir ]; then pkgs=$backup_dir/pkgs - ( cd $pkg_dbdir + ( cd $pkgdb_dir pkg_info | sort echo "" find . \( -name +REQUIRED_BY -o -name +CONTENTS \) -print0 |