d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. If PKG_DBDIR cannot be determined from make, set the default

Browse Source 
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@jdc.parodius.com> [1]
This commit is contained in:
Doug Barton 2011-05-05 02:35:11 +00:00
parent 8820ce5fe7
commit f7e2bd0458
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/periodic/daily/220.backup-pkgdb
View File

@ -18,7 +18,8 @@ case "$daily_backup_pkgdb_enable" in
bak="${daily_backup_pkgdb_dir:-/var/backups}" bak="${daily_backup_pkgdb_dir:-/var/backups}"
bak_file="${bak}/pkgdb.bak.tbz" 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" ] if [ ! -d "$bak" ]
then then
@ -33,7 +34,7 @@ case "$daily_backup_pkgdb_enable" in
new_bak_file=`mktemp ${bak_file}-XXXXX` 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}" chmod 644 "${new_bak_file}"
if [ -e "${bak_file}.2" -a -e "${bak_file}" ]; then if [ -e "${bak_file}.2" -a -e "${bak_file}" ]; then