svn commit: r218549 - stable/7/etc

Jaakko Heinonen jh at FreeBSD.org
Fri Feb 11 10:06:49 UTC 2011


Author: jh
Date: Fri Feb 11 10:06:49 2011
New Revision: 218549
URL: http://svn.freebsd.org/changeset/base/218549

Log:
  MFC r217090:
  
  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

Modified:
  stable/7/etc/rc.subr
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/rc.subr
==============================================================================
--- stable/7/etc/rc.subr	Fri Feb 11 09:58:38 2011	(r218548)
+++ stable/7/etc/rc.subr	Fri Feb 11 10:06:49 2011	(r218549)
@@ -1242,7 +1242,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"


More information about the svn-src-stable-7 mailing list