public_git
/
democratic-csi
mirror of https://github.com/democratic-csi/democratic-csi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fixes, v1.9.2 

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen 2024-05-23 08:53:39 -06:00
parent 23e6ecb1fa
commit 7206429913
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
# v1.9.2
Released 2024-05-23
- minor fixes for objectivefs and iscsi
# v1.9.1 # v1.9.1
Released 2024-05-06 Released 2024-05-06

2
docker/iscsiadm
View File

@ -13,7 +13,7 @@ case ${ISCSIADM_HOST_STRATEGY} in
nsenter) nsenter)
# https://github.com/siderolabs/extensions/issues/38#issuecomment-1125403043 # 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 if [[ "${iscsid_pid}x" == "x" ]]; then
echoerr "failed to find iscsid pid for nsenter" echoerr "failed to find iscsid pid for nsenter"
exit 1 exit 1

4
src/utils/objectivefs.js
View File

@ -275,13 +275,13 @@ class ObjectiveFS {
async getObjectStoreFromFilesystem(filesystem) { async getObjectStoreFromFilesystem(filesystem) {
if (filesystem.includes("://")) { if (filesystem.includes("://")) {
return GeneralUtils.before_string("://"); return GeneralUtils.before_string(filesystem, "://");
} }
} }
async stripObjectStoreFromFilesystem(filesystem) { async stripObjectStoreFromFilesystem(filesystem) {
if (filesystem.includes("://")) { if (filesystem.includes("://")) {
return GeneralUtils.after_string("://"); return GeneralUtils.after_string(filesystem, "://");
} }
return filesystem; return filesystem;
} }