Jaakko Heinonen
2011-01-07 10:59:23 UTC
Author: jh
Date: Fri Jan 7 10:59:22 2011
New Revision: 217090
URL: http://svn.freebsd.org/changeset/base/217090
Log:
Warn if rules could not be read from a ruleset file. Now at least
something gets logged if the file has syntax errors.
PR: conf/91342
Silence on: freebsd-rc
Modified:
head/etc/rc.subr
Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr Fri Jan 7 08:45:56 2011 (r217089)
+++ head/etc/rc.subr Fri Jan 7 10:59:22 2011 (r217090)
@@ -1349,7 +1349,10 @@ devfs_init_rulesets()
return
fi
for file in $devfs_rulesets; do
- devfs_rulesets_from_file $file || return 1
+ if ! devfs_rulesets_from_file $file; then
+ warn "$_me: could not read rules from $file"
+ return 1
+ fi
done
devfs_rulesets_init=1
debug "$_me: devfs rulesets initialized"
Date: Fri Jan 7 10:59:22 2011
New Revision: 217090
URL: http://svn.freebsd.org/changeset/base/217090
Log:
Warn if rules could not be read from a ruleset file. Now at least
something gets logged if the file has syntax errors.
PR: conf/91342
Silence on: freebsd-rc
Modified:
head/etc/rc.subr
Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr Fri Jan 7 08:45:56 2011 (r217089)
+++ head/etc/rc.subr Fri Jan 7 10:59:22 2011 (r217090)
@@ -1349,7 +1349,10 @@ devfs_init_rulesets()
return
fi
for file in $devfs_rulesets; do
- devfs_rulesets_from_file $file || return 1
+ if ! devfs_rulesets_from_file $file; then
+ warn "$_me: could not read rules from $file"
+ return 1
+ fi
done
devfs_rulesets_init=1
debug "$_me: devfs rulesets initialized"