From 7206429913903382e5cac5b4b0140d0427e5fd61 Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Thu, 23 May 2024 08:53:39 -0600
Subject: [PATCH] minor fixes, v1.9.2

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
---
 CHANGELOG.md             | 6 ++++++
 docker/iscsiadm          | 2 +-
 src/utils/objectivefs.js | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0e716b..24b13d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.9.2
+
+Released 2024-05-23
+
+- minor fixes for objectivefs and iscsi
+
 # v1.9.1
 
 Released 2024-05-06
diff --git a/docker/iscsiadm b/docker/iscsiadm
index c576f00..8d44262 100755
--- a/docker/iscsiadm
+++ b/docker/iscsiadm
@@ -13,7 +13,7 @@ case ${ISCSIADM_HOST_STRATEGY} in
 
   nsenter)
     # https://github.com/siderolabs/extensions/issues/38#issuecomment-1125403043
-    iscsid_pid=$(pgrep iscsid)
+    iscsid_pid=$(pgrep --exact --oldest iscsid)
     if [[ "${iscsid_pid}x" == "x" ]]; then
       echoerr "failed to find iscsid pid for nsenter"
       exit 1
diff --git a/src/utils/objectivefs.js b/src/utils/objectivefs.js
index bdc23cf..e89a011 100644
--- a/src/utils/objectivefs.js
+++ b/src/utils/objectivefs.js
@@ -275,13 +275,13 @@ class ObjectiveFS {
 
   async getObjectStoreFromFilesystem(filesystem) {
     if (filesystem.includes("://")) {
-      return GeneralUtils.before_string("://");
+      return GeneralUtils.before_string(filesystem, "://");
     }
   }
 
   async stripObjectStoreFromFilesystem(filesystem) {
     if (filesystem.includes("://")) {
-      return GeneralUtils.after_string("://");
+      return GeneralUtils.after_string(filesystem, "://");
     }
     return filesystem;
   }