diff options
| author | dougb <dougb@FreeBSD.org> | 2011-05-05 02:35:11 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2011-05-05 02:35:11 +0000 |
| commit | 11dd08fd538e3b72326c44b44ddd991eafb03d31 (patch) | |
| tree | f86bb3ee8d603bf9828b13bdbfde075d26204a15 /etc/periodic | |
| parent | 3c39245f5762ade828e04295ea9ff76770b1d4d3 (diff) | |
| download | FreeBSD-src-11dd08fd538e3b72326c44b44ddd991eafb03d31.zip FreeBSD-src-11dd08fd538e3b72326c44b44ddd991eafb03d31.tar.gz | |
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]
Diffstat (limited to 'etc/periodic')
| -rwxr-xr-x | etc/periodic/daily/220.backup-pkgdb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/periodic/daily/220.backup-pkgdb b/etc/periodic/daily/220.backup-pkgdb index 8a37b1c..a6b50e5 100755 --- a/etc/periodic/daily/220.backup-pkgdb +++ b/etc/periodic/daily/220.backup-pkgdb @@ -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 |
