diff options
author | jim-p <jimp@pfsense.org> | 2010-05-11 16:24:07 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2010-05-11 16:26:06 -0400 |
commit | c57a3ac8efd3bdd9520d97227bf1210605e521f7 (patch) | |
tree | 4b69e75773cf8921d522b595435904a439ff63f6 /etc/inc/filter.inc | |
parent | 53b18623f54544226ef84364579c776d4b37b056 (diff) | |
download | pfsense-c57a3ac8efd3bdd9520d97227bf1210605e521f7.zip pfsense-c57a3ac8efd3bdd9520d97227bf1210605e521f7.tar.gz |
Don't load the package include files if the packages are out of sync, which can lead to the system not booting properly. Should help with ticket #267.
Diffstat (limited to 'etc/inc/filter.inc')
-rw-r--r-- | etc/inc/filter.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index f1ed926..d485de8 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2606,7 +2606,8 @@ EOD; function discover_pkg_rules($ruletype) { global $config, $g; - if(!is_dir("/usr/local/pkg")) + /* Bail if there is no pkg directory, or if the package files might be out of sync. */ + if(!is_dir("/usr/local/pkg") || file_exists('/conf/needs_package_sync')) return ""; $rules = ""; |