summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/diag_nanobsd.php
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-11-06 09:55:45 +0545
committerPhil Davis <phil.davis@inf.org>2015-11-06 09:55:45 +0545
commit612d0fb365c873c97ca0bde23bd252e60ec7cbae (patch)
treecca7d2c032d8d257e04503d6278e408cb6ef91de /src/usr/local/www/diag_nanobsd.php
parent9da2cf1c6e8e2e9b99d2369dbedb13c580a39377 (diff)
downloadpfsense-612d0fb365c873c97ca0bde23bd252e60ec7cbae.zip
pfsense-612d0fb365c873c97ca0bde23bd252e60ec7cbae.tar.gz
diag_nanobsd do not show reference count 0
When the user has selected "Keep media mounted read/write at all times." then the value of $refcount will be zero even though is_writable() is true. That is a normal condition. We only want to display the (Reference count n) text when the reference count is abnormal. This is a "bug" in 2.2.* also, not a regression in 2.3-ALPHA. But it might as well just be changed in master 2.3. Not much point back-porting little crud like this to RELENG_2_2 nowadays.
Diffstat (limited to 'src/usr/local/www/diag_nanobsd.php')
-rw-r--r--src/usr/local/www/diag_nanobsd.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/usr/local/www/diag_nanobsd.php b/src/usr/local/www/diag_nanobsd.php
index 34e1433..ec4dc55 100644
--- a/src/usr/local/www/diag_nanobsd.php
+++ b/src/usr/local/www/diag_nanobsd.php
@@ -168,7 +168,9 @@ $section->addInput(new Form_StaticText(
if (is_writable("/")) {
$refcount = refcount_read(1000);
/* refcount_read returns -1 when shared memory section does not exist */
- if ($refcount == 1 || $refcount == -1) {
+ /* refcount can be zero here when the user has set nanobsd_force_rw */
+ /* refcount 1 is normal, so only display the count for abnormal values */
+ if ($refcount == 1 || $refcount == 0 || $refcount == -1) {
$refdisplay = "";
} else {
$refdisplay = " (Reference count " . $refcount . ")";
OpenPOWER on IntegriCloud