Update version to 1.0.43 + update cvmfs_config probe

YBelikov · Oct 31, 2024 · 40f826c · 40f826c
1 parent 6a855b6
commit 40f826c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
@@ -28,8 +28,8 @@ jobs:
       - name: Install Fuse-t and dependencies
         run: |
           brew install python-setuptools
-          wget -q https://github.com/macos-fuse-t/fuse-t/releases/download/1.0.41/fuse-t-macos-installer-1.0.41.pkg
-          sudo installer -pkg fuse-t-macos-installer-1.0.41.pkg -target /
+          wget -q https://github.com/macos-fuse-t/fuse-t/releases/download/1.0.43/fuse-t-macos-installer-1.0.43.pkg
+          sudo installer -pkg fuse-t-macos-installer-1.0.43.pkg -target /
           ls /usr/local/include
 
       - name: Build CVMFS

diff --git a/cvmfs/cvmfs_config b/cvmfs/cvmfs_config
@@ -1213,6 +1213,7 @@ cvmfs_reload() {
           rm -rf "$dir" && \
             mkdir -p "$dir" && \
             chown $CVMFS_USER "$dir"
+            sleep 15
           if [ $? -ne 0 ]; then
             echo "Failed!"
             RETVAL=1
@@ -1233,9 +1234,6 @@ cvmfs_reload() {
     for pidfile in ${CVMFS_RELOAD_SOCKETS}/pid.*; do
       kill -s USR1 $(cat $pidfile)
       rm -f $pidfile
-      if [ x"$sys_arch" = x"Darwin" ]; then
-        sleep 90
-      fi
     done
   fi
   wait
@@ -1268,7 +1266,7 @@ cvmfs_probe() {
         echo -n "Probing $CVMFS_MOUNT_DIR/$fqrn... "
         ls "$CVMFS_MOUNT_DIR/$fqrn" > /dev/null 2>&1  # workaround for FC28+
         if [ "$sys_arch" = "Darwin" ] && ! is_macfuse_enabled; then
-          df -P "$CVMFS_MOUNT_DIR/$fqrn" 2>&1 | grep -q ^fuse-t
+          df -P "$CVMFS_MOUNT_DIR/$fqrn" 2>&1 | grep -q "$fqrn"
         else 
           df -P "$CVMFS_MOUNT_DIR/$fqrn" 2>&1 | grep -q ^cvmfs2
         fi