Merge pull request #404 from democratic-csi/next

minor fixes, v1.9.2

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

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

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;
   }