From owner-svn-src-all@FreeBSD.ORG  Sat May 14 21:44:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC4CC1065670;
	Sat, 14 May 2011 21:44:12 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B6C78FC13;
	Sat, 14 May 2011 21:44:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4ELiCDG017132;
	Sat, 14 May 2011 21:44:12 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4ELiCrI017130;
	Sat, 14 May 2011 21:44:12 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201105142144.p4ELiCrI017130@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 14 May 2011 21:44:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221930 - stable/7/etc/periodic/daily
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 May 2011 21:44:12 -0000

Author: dougb
Date: Sat May 14 21:44:12 2011
New Revision: 221930
URL: http://svn.freebsd.org/changeset/base/221930

Log:
  MFC r221475:
  
  1. If PKG_DBDIR cannot be determined from make, set the default
  2. Add the -H flag to tar in case /var/db/pkg itself is a symlink
  3. Direct stderr to /dev/null to suppress the leading slash warning

Modified:
  stable/7/etc/periodic/daily/220.backup-pkgdb
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/periodic/daily/220.backup-pkgdb
==============================================================================
--- stable/7/etc/periodic/daily/220.backup-pkgdb	Sat May 14 21:42:08 2011	(r221929)
+++ stable/7/etc/periodic/daily/220.backup-pkgdb	Sat May 14 21:44:12 2011	(r221930)
@@ -18,7 +18,8 @@ case "$daily_backup_pkgdb_enable" in
 	bak="${daily_backup_pkgdb_dir:-/var/backups}"
 	bak_file="${bak}/pkgdb.bak.tbz"
 
-	pkg_dbdir=`make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null`
+	pkg_dbdir=`make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null` ||
+	  pkg_dbdir=/var/db/pkg
 
 	if [ ! -d "$bak" ]
 	then
@@ -33,7 +34,7 @@ case "$daily_backup_pkgdb_enable" in
 
 	new_bak_file=`mktemp ${bak_file}-XXXXX`
 
-	if tar -cjf "${new_bak_file}" "$pkg_dbdir"; then
+	if tar -cjHf "${new_bak_file}" "$pkg_dbdir" 2>/dev/null; then
 	    chmod 644 "${new_bak_file}"
 
 	    if [ -e "${bak_file}.2" -a -e "${bak_file}" ]; then