diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index afb8aabc2..f3a86ca28 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -69,7 +69,7 @@ $parity = $var['mdResync']; $mover = file_exists('/var/run/mover.pid'); $btrfs = exec('pgrep -cf /sbin/btrfs'); $dot = $display['number'][0]; -$zfs = false; +$zfs = file_exists('/proc/spl/kstat/zfs/arcstats'); foreach ($disks as $disk) { switch ($disk['type']) { @@ -87,7 +87,6 @@ foreach ($disks as $disk) { $cache_type[$name] = $disk['rotational'] ? ($disk['luksState'] ? 'disk-encrypted' : 'disk') : 'nvme'; $cache_rate[$name] = number_format(100*$cache_used[$name]/($cache_size[$name] ?: 1),1,$dot,''); if (!$disks[$name]['devices']) unset($pools[array_search($name,$pools)]); - if (isset($disks[$name]['fsType']) && strpos($disks[$name]['fsType'],'zfs')!==false) $zfs = true; } break; } diff --git a/plugins/dynamix/include/update.file.php b/plugins/dynamix/include/update.file.php index 2c5f57acd..93eb2e806 100644 --- a/plugins/dynamix/include/update.file.php +++ b/plugins/dynamix/include/update.file.php @@ -1,6 +1,6 @@ diff --git a/plugins/dynamix/nchan/update_1 b/plugins/dynamix/nchan/update_1 index 95c960e80..429a33e96 100755 --- a/plugins/dynamix/nchan/update_1 +++ b/plugins/dynamix/nchan/update_1 @@ -23,7 +23,7 @@ while (true) { exec("sensors -uA 2>/dev/null|grep -Po 'fan\d_input: \K\d+'",$rpms); [$total,$free] = $memory; $used = $total-$free; - $zfs = (exec("awk '/^size/{print \$3}' /proc/spl/kstat/zfs/arcstats 2>/dev/null")?:0)/1024; + $zfs = (exec("awk '/^size/{print \$3;exit}' /proc/spl/kstat/zfs/arcstats 2>/dev/null")?:0)/1024; $info = max(round(100*(1-$free/$total)),0)."%\0".round(100*$zfs/$used)."%\0".implode("\0",$sys); $rpms = count($rpms) ? implode(" RPM\0",$rpms).' RPM' : ''; diff --git a/update.php b/update.php index bd0bda501..1bc3cbeba 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ $value) if ($key[0]!='#') $keys[$section][$key] = isset($default[$section][$key]) ? $default[$section][$key] : $value; + foreach ($_POST as $key => $value) if ($key[0]!='#') $keys[$section][$key] = $default[$section][$key] ?? $value; foreach ($keys as $section => $block) { $text .= "[$section]\n"; foreach ($block as $key => $value) if (strlen($value) || !$cleanup) $text .= "$key=\"$value\"\n"; } } else { - foreach ($_POST as $key => $value) if ($key[0]!='#') $keys[$key] = isset($default[$key]) ? $default[$key] : $value; + foreach ($_POST as $key => $value) if ($key[0]!='#') $keys[$key] = $default[$key] ?? $value; foreach ($keys as $key => $value) if (strlen($value) || !$cleanup) $text .= "$key=\"$value\"\n"; } @mkdir(dirname($file));