mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
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@jdc.parodius.com> [1]
This commit is contained in:
parent
8820ce5fe7
commit
f7e2bd0458
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=221475
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user