Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 May 2011 21:42:09 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r221929 - stable/8/etc/periodic/daily
Message-ID:  <201105142142.p4ELg9RZ017032@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Sat May 14 21:42:08 2011
New Revision: 221929
URL: http://svn.freebsd.org/changeset/base/221929

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/8/etc/periodic/daily/220.backup-pkgdb
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/periodic/daily/220.backup-pkgdb
==============================================================================
--- stable/8/etc/periodic/daily/220.backup-pkgdb	Sat May 14 21:34:21 2011	(r221928)
+++ stable/8/etc/periodic/daily/220.backup-pkgdb	Sat May 14 21:42:08 2011	(r221929)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105142142.p4ELg9RZ017032>