From b783d4b207eda4e633f4e414ae04fc4f7fe56a27 Mon Sep 17 00:00:00 2001
From: Tom Mortensen <tomm@lime-technology.com>
Date: Fri, 11 Oct 2024 02:22:55 -0700
Subject: [PATCH] more killall and pgrep updates.

---
 emhttp/plugins/dynamix/include/FileSystemStatus.php | 2 +-
 emhttp/plugins/dynamix/include/Helpers.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/FileSystemStatus.php b/emhttp/plugins/dynamix/include/FileSystemStatus.php
index 2901f3524..736dc2685 100644
--- a/emhttp/plugins/dynamix/include/FileSystemStatus.php
+++ b/emhttp/plugins/dynamix/include/FileSystemStatus.php
@@ -40,7 +40,7 @@ default:
   $file = "/var/lib/$dir/check.status.$id";
   if (file_exists($file)) {
     switch ($cmd) {
-      case 'btrfs-check': $pgrep = 'pgrep --ns \$\$ -f '."'/sbin/btrfs check .*$dev'"; break;
+      case 'btrfs-check': $pgrep = 'pgrep --ns $$ -f '."'/sbin/btrfs check .*$dev'"; break;
       case 'rfs-check': $pgrep = 'pgrep --ns $$  -f '."'/sbin/reiserfsck $dev'"; break;
       case 'xfs-check': $pgrep = 'pgrep --ns $$ -f '."'/sbin/xfs_repair.*$dev'"; break;
     }
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 6908d526b..69d61e506 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -372,7 +372,7 @@ function my_rmdir($dirname) {
         'dataset' => $zfsdataset,
         'type' => $fstype,
         'cmd' => $cmdstr,
-        'error' =>
+        'error' => $error,
       ];
       break;
     case "btrfs":