Module Name: src
Committed By: christos
Date: Tue Jul 31 09:23:10 UTC 2012
Modified Files:
src/etc: daily
Log Message:
PR/46757: Check for fetch_pkg_vulnerabilities unset first.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/etc/daily
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.84 src/etc/daily:1.85
--- src/etc/daily:1.84 Mon Jul 30 18:13:38 2012
+++ src/etc/daily Tue Jul 31 05:23:09 2012
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.84 2012/07/30 22:13:38 jdf Exp $
+# $NetBSD: daily,v 1.85 2012/07/31 09:23:09 christos Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -246,8 +246,8 @@ if checkyesno run_fsck; then
fsck -n -f ${run_fsck_flags} | grep -v '^\*\* Phase'
fi
-echo ""
if checkyesno run_rdist && [ -f /etc/Distfile ]; then
+ echo ""
echo "Running rdist:"
if [ -d /var/log/rdist ]; then
logf="$(date +%Y.%b.%d)"
@@ -260,13 +260,13 @@ fi
if pkg_info ${_compat_K_flag} -q -E '*'; then
echo ""
echo "Fetching package vulnerabilities database:"
- if checkyesno fetch_pkg_vulnerabilities; then
- ( umask 022 && pkg_admin ${_compat_K_flag} \
- fetch-pkg-vulnerabilities -u )
- elif [ -z "$fetch_pkg_vulnerabilities" ]; then
+ if [ -z "fetch_pkg_vulnerabilities" ]; then
echo "fetch_pkg_vulnerabilities is not set in daily.conf(5)."
echo "You should set it to YES to enable vulnerability checks"
echo "or set it to NO to get rid of this warning."
+ elif checkyesno fetch_pkg_vulnerabilities; then
+ ( umask 022 && pkg_admin ${_compat_K_flag} \
+ fetch-pkg-vulnerabilities -u )
fi
fi
