Module Name: src
Committed By: prlw1
Date: Sun Sep 8 08:19:40 UTC 2013
Modified Files:
src/etc: daily security
Log Message:
Add defaults for pkg_info and pkg_admin variables in case pkgpath.conf
is not installed.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/etc/daily
cvs rdiff -u -r1.112 -r1.113 src/etc/security
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.89 src/etc/daily:1.90
--- src/etc/daily:1.89 Wed May 1 05:36:25 2013
+++ src/etc/daily Sun Sep 8 08:19:40 2013
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.89 2013/05/01 05:36:25 agc Exp $
+# $NetBSD: daily,v 1.90 2013/09/08 08:19:40 prlw1 Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -18,6 +18,9 @@ host="$(hostname)"
date="$(date)"
rcvar_manpage='daily.conf(5)'
+pkg_admin=${pkg_admin:-/usr/sbin/pkg_admin}
+pkg_info=${pkg_info:-/usr/sbin/pkg_info}
+
echo "To: ${MAILTO:-root}"
echo "Subject: $host daily output for $date"
echo ""
Index: src/etc/security
diff -u src/etc/security:1.112 src/etc/security:1.113
--- src/etc/security:1.112 Wed May 1 05:36:25 2013
+++ src/etc/security Sun Sep 8 08:19:40 2013
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: security,v 1.112 2013/05/01 05:36:25 agc Exp $
+# $NetBSD: security,v 1.113 2013/09/08 08:19:40 prlw1 Exp $
# from: @(#)security 8.1 (Berkeley) 6/9/93
#
@@ -30,6 +30,7 @@ fi
backup_dir=${backup_dir:-/var/backups}
max_loginlen=${max_loginlen:-8}
max_grouplen=${max_grouplen:-8}
+pkg_admin=${pkg_admin:-/usr/sbin/pkg_admin}
pkg_info=${pkg_info:-/usr/sbin/pkg_info}
# Other configurable variables