Author: eugen
Date: Sat Dec 15 23:20:08 2018
New Revision: 342141
URL: https://svnweb.freebsd.org/changeset/base/342141
Log:
periodic/weekly/340.noid: do not use sysrc(8) that depends
on bsdinstall(8) and may be non-functional
for system built WITHOUT_BSDINSTALL. (*)
Also, add a check for jails sharing whole tree with host (path=/)
and do not skip it.
Reported by: andre.albsme...@siemens.com (*)
MFC after: 1 week
Modified:
head/usr.sbin/periodic/etc/weekly/340.noid
Modified: head/usr.sbin/periodic/etc/weekly/340.noid
==============================================================================
--- head/usr.sbin/periodic/etc/weekly/340.noid Sat Dec 15 22:02:02 2018
(r342140)
+++ head/usr.sbin/periodic/etc/weekly/340.noid Sat Dec 15 23:20:08 2018
(r342141)
@@ -22,13 +22,24 @@ case "$weekly_noid_enable" in
exclude=''
if [ $(sysctl -n security.jail.jailed) = 0 ]; then
+ # For jail_conf
+ . /etc/rc.subr
+ load_rc_config jail
+
sep=:
OIFS="$IFS"
IFS="$sep"
- for param in $(jail -f "`sysrc -n jail_conf`" -e "$sep" 2>/dev/null)
+ for param in $(jail -f "$jail_conf" -e "$sep" 2>/dev/null)
do
case "$param" in
- path=*) exclude="$exclude -path ${param#path=} -prune -or"
+ path=*)
+ _p=${param#path=}
+ if [ -z "$_p" -o "$_p" = / ]; then
+ continue
+ fi
+
+ exclude="$exclude -path $_p -prune -or"
+ ;;
esac
done
IFS="$OIFS"
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
