add overlayfs as backup

Author: zerobikappa

.github/workflows/build.yml

@@ -25,6 +25,7 @@ jobs:
             libfuse2 \
             file \
             unzip \
+            patchelf \
             unionfs-fuse \
             fuse-overlayfs
 
@@ -47,6 +48,8 @@ jobs:
           ./appimage-myapp-appdir-template/.remove-appdir-git.sh
 
           cp "$(command -v unionfs)" appimage-myapp-appdir-template/usr/bin/
+          cp "$(command -v fuse-overlayfs)" appimage-myapp-appdir-template/usr/bin/
+          patchelf --replace-needed libfuse3.so.3 libfuse3.so appimage-myapp-appdir-template/usr/bin/fuse-overlayfs
           ARCH=x86_64 ./appimagetool.AppImage appimage-myapp-appdir-template
 
           #ARCH=aarch64 ./appimagetool.AppImage appimage-myapp-appdir-template

.github/workflows/test.yml

@@ -25,6 +25,7 @@ jobs:
             libfuse2 \
             file \
             unzip \
+            patchelf \
             unionfs-fuse \
             fuse-overlayfs
 
@@ -47,6 +48,8 @@ jobs:
           ./appimage-myapp-appdir-template/.remove-appdir-git.sh
 
           cp "$(command -v unionfs)" appimage-myapp-appdir-template/usr/bin/
+          cp "$(command -v fuse-overlayfs)" appimage-myapp-appdir-template/usr/bin/
+          patchelf --replace-needed libfuse3.so.3 libfuse3.so appimage-myapp-appdir-template/usr/bin/fuse-overlayfs
           ARCH=x86_64 ./appimagetool.AppImage appimage-myapp-appdir-template
 
           #ARCH=aarch64 ./appimagetool.AppImage appimage-myapp-appdir-template

opt/myapp/myapp_script/main.sh

@@ -2,7 +2,7 @@
 
 # AppRun Script version
 # date -u +%s
-MYAPPRUN_VERSION=3.2.1
+MYAPPRUN_VERSION=3.2.2
 export MYAPPRUN_VERSION
 
 
@@ -64,8 +64,16 @@ source ./myapp-plugin-exeinfo.sh 2>/dev/null
 source "${HERE}"/core.sh
 source "${HERE}"/myapp-debug.sh
 source "${HERE}"/myapp-plugin-wine.sh
-source "${HERE}"/myapp-plugin-fusetool.sh
 source "${HERE}"/myapp-plugin-exeinfo.sh
+if [[ "${MYAPP_FUSE}" == "OVERLAYFS" ]];
+then
+    source "${HERE}"/myapp-plugin-overlayfs-fuse.sh
+elif [[ "${MYAPP_FUSE}" == "UNIONFS" ]];
+then
+    source "${HERE}"/myapp-plugin-unionfs-fuse.sh
+else
+    source "${HERE}"/myapp-plugin-fusetool.sh
+fi
 
 prevent_root
 

opt/myapp/myapp_script/myapp-plugin-overlayfs-fuse.sh

@@ -94,17 +94,17 @@ function mpPlugin_fusetool_mount(){
     rm -rf "$WORKDIR_MYAPP"
     mkdir -p "$MNT_MYAPP" "$UPPERDIR_MYAPP" "$WORKDIR_MYAPP"
 
-    "$UNIONFS_BIN" -o lowerdir="$LOWERDIR_MYAPP",upperdir="$UPPERDIR_MYAPP",workdir="$WORKDIR_MYAPP" "$MNT_MYAPP" || exit 1
+    "$UNIONFS_BIN" -o squash_to_uid=$UID,lowerdir="$LOWERDIR_MYAPP",upperdir="$UPPERDIR_MYAPP",workdir="$WORKDIR_MYAPP" "$MNT_MYAPP" || exit 1
 
     rm -rf "$WORKDIR_HOME"
     mkdir -p "$MNT_HOME" "$UPPERDIR_HOME" "$WORKDIR_HOME"
 
     if [[ -d "$APPDIR/home/public_user" ]];
     then
         # should also refer home/public_user directory in $APPDIR, if user also add this directory into appimage
-        "$UNIONFS_BIN" -o lowerdir="$APPDIR/home/public_user":"$LOWERDIR_HOME",upperdir="$UPPERDIR_HOME",workdir="$WORKDIR_HOME" "$MNT_HOME" || exit 1
+        "$UNIONFS_BIN" -o squash_to_uid=$UID,lowerdir="$APPDIR/home/public_user":"$LOWERDIR_HOME",upperdir="$UPPERDIR_HOME",workdir="$WORKDIR_HOME" "$MNT_HOME" || exit 1
     else
-        "$UNIONFS_BIN" -o lowerdir="$LOWERDIR_HOME",upperdir="$UPPERDIR_HOME",workdir="$WORKDIR_HOME" "$MNT_HOME" || exit 1
+        "$UNIONFS_BIN" -o squash_to_uid=$UID,lowerdir="$LOWERDIR_HOME",upperdir="$UPPERDIR_HOME",workdir="$WORKDIR_HOME" "$MNT_HOME" || exit 1
     fi
 
     PID_MYAPP="$(pgrep -a fuse-overlayfs | grep "$MNT_MYAPP" | awk '{print $1}')"
@@ -130,7 +130,9 @@ function mpPlugin_fusetool_unmount(){
     kill -9 "$PID_MYAPP"
     kill -9 "$PID_HOME"
     sleep 1
+    echo "[${FUNCNAME[0]}:] umount /tmp/$(basename "$APPDIR").unionfs/opt/${MYAPP_NAME}"
     umount "/tmp/$(basename "$APPDIR").unionfs/opt/${MYAPP_NAME}"
+    echo "[${FUNCNAME[0]}:] umount /tmp/$(basename "$APPDIR").unionfs/home/public_user"
     umount "/tmp/$(basename "$APPDIR").unionfs/home/public_user"
     echo "[${FUNCNAME[0]}:] removing /tmp/$(basename "$APPDIR").unionfs"
     rm -rf "/tmp/$(basename "$APPDIR").unionfs"