diff options
author | jim-p <jimp@pfsense.org> | 2016-12-29 10:21:07 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2016-12-29 10:21:07 -0500 |
commit | 387dbe43774028de7f82389a90ae6944d661a96e (patch) | |
tree | c4f2bfca755a905c8593701197a6aa081507b31c /src/usr/local/www | |
parent | a2c453fdadc4e02bbdb77c6803a2667118b70bee (diff) | |
download | pfsense-387dbe43774028de7f82389a90ae6944d661a96e.zip pfsense-387dbe43774028de7f82389a90ae6944d661a96e.tar.gz |
Only fetch ZFS status if ZFS is loaded. Otherwise it can load it unintentionally on a system that doesn't need it.
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/status.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/usr/local/www/status.php b/src/usr/local/www/status.php index 9a5a36e..0c9e33f 100644 --- a/src/usr/local/www/status.php +++ b/src/usr/local/www/status.php @@ -310,10 +310,13 @@ defCmdT("OS-Kernel Environment", "/bin/kenv"); defCmdT("OS-Installed Packages", "/usr/sbin/pkg info"); defCmdT("Hardware-PCI Devices", "/usr/sbin/pciconf -lvb"); defCmdT("Hardware-USB Devices", "/usr/sbin/usbconfig dump_device_desc"); -defCmdT("Disk-ZFS List", "/sbin/zfs list"); -defCmdT("Disk-ZFS Properties", "/sbin/zfs get all"); -defCmdT("Disk-ZFS Pool List", "/sbin/zpool list"); -defCmdT("Disk-ZFS Pool Status", "/sbin/zpool status"); + +if (is_module_loaded("zfs.ko")) { + defCmdT("Disk-ZFS List", "/sbin/zfs list"); + defCmdT("Disk-ZFS Properties", "/sbin/zfs get all"); + defCmdT("Disk-ZFS Pool List", "/sbin/zpool list"); + defCmdT("Disk-ZFS Pool Status", "/sbin/zpool status"); +} defCmdT("Disk-GEOM Mirror Status", "/sbin/gmirror status"); exec("/bin/date", $dateOutput, $dateStatus); |