svn commit: r221475 - head/etc/periodic/daily

[Doug Barton]

Author: dougb
Date: Thu May  5 02:35:11 2011
New Revision: 221475
URL: http://svn.freebsd.org/changeset/base/221475

Log:
  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 [1]
  
  PR:		ports/156810 [1]
  Submitted by:	Jeremy Chadwick <freebsd at jdc.parodius.com> [1]

Modified:
  head/etc/periodic/daily/220.backup-pkgdb

Modified: head/etc/periodic/daily/220.backup-pkgdb
==============================================================================
--- head/etc/periodic/daily/220.backup-pkgdb	Thu May  5 02:04:56 2011	(r221474)
+++ head/etc/periodic/daily/220.backup-pkgdb	Thu May  5 02:35:11 2011	(r221475)
@@ -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