library.sh,nc-database.sh,nc-datadir.sh,ncp-restore: Define supported…

… filesystems in library.sh, enable f2fs
twojstaryzdomu · Jan 4, 2025 · 5615e26 · 5615e26
1 parent baa8438
commit 5615e26
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/bin/ncp-restore b/bin/ncp-restore
@@ -17,7 +17,7 @@ DIR="$( cd "$( dirname "$BACKUPFILE" )" &>/dev/null && pwd )" #abspath
 [[ "$DIR" =~ "$NCDIR".* ]] && { echo "Refusing to restore from $NCDIR"; exit 1; }
 
 TEMPDIR="$( mktemp -d "$( dirname "$BACKUPFILE" )"/ncp-restore.XXXXXX )" || { echo "Failed to create temp dir" >&2; exit 1; }
-[[ "$(stat -fc%T "${TEMPDIR}")" =~ ext|btrfs|zfs ]] || { echo "Can only restore from ext/btrfs/zfs filesystems (found '$(stat -fc%T "${TEMPDIR}")"     >&2; exit 1; }
+[[ "$(stat -fc%T "${TEMPDIR}")" =~ $FS ]] || { echo "Can only restore from ${FS//|/\/} filesystems (found '$(stat -fc%T "${TEMPDIR}")')" >&2; exit 1; }
 
 TEMPDIR="$( cd "$TEMPDIR" &>/dev/null && pwd )" || { echo "$TEMPDIR not found"; exit 1; } #abspath
 cleanup(){  local RET=$?; echo "Cleanup..."; rm -rf "${TEMPDIR}"; trap "" EXIT; exit $RET; }

diff --git a/bin/ncp/CONFIG/nc-database.sh b/bin/ncp/CONFIG/nc-database.sh
@@ -37,7 +37,7 @@ configure()
   local BASEDIR=$( dirname "$DBDIR" )
   mkdir -p "$BASEDIR"
 
-  [[ "$(stat -fc%T "${BASEDIR}")" =~ ext|btrfs|zfs ]] || { echo -e "Only ext/btrfs/zfs filesystems can hold the data directory (found '$(stat -fc%T "${BASEDIR}")"; return 1; }
+  [[ "$(stat -fc%T "${BASEDIR}")" =~ $FS ]] || { echo -e "Only ${FS//|/\/} filesystems can hold the data directory (found '$(stat -fc%T "${BASEDIR}")')"; return 1; }
 
   sudo -u mysql test -x "$BASEDIR" || { echo -e "ERROR: the user mysql does not have access permissions over $BASEDIR"; return 1; }
 

diff --git a/bin/ncp/CONFIG/nc-datadir.sh b/bin/ncp/CONFIG/nc-datadir.sh
@@ -79,8 +79,8 @@ configure()
   ENCDIR="${BASEDIR}"/ncdata_enc
 
   # checks
-  [[ "$DISABLE_FS_CHECK" == 1 ]] || [[ "$(stat -fc%T "${BASEDIR}")" =~ ext|btrfs|zfs ]] || {
-    echo -e "Only ext/btrfs/zfs filesystems can hold the data directory (found '$(stat -fc%T "${BASEDIR}")')"
+  [[ "$DISABLE_FS_CHECK" == 1 ]] || [[ "$(stat -fc%T "${BASEDIR}")" =~ $FS ]] || {
+    echo -e "Only ${FS//|/\/} filesystems can hold the data directory (found '$(stat -fc%T "${BASEDIR}")')"
     return 1
   }
 

diff --git a/etc/library.sh b/etc/library.sh
@@ -17,6 +17,7 @@ export REDIS_CONF=${REDIS_CONF:-/etc/redis/redis.conf}
 export APACHE_LOG_DIR=${APACHE_LOG_DIR:-/var/log/apache2}
 export ARCH="$(dpkg --print-architecture)"
 export DB_PREFIX="$(php -r 'include("/var/www/nextcloud/config/config.php"); echo $CONFIG['"'dbtableprefix'"'];' || echo 'oc_')"
+export FS="ext|btrfs|zfs|f2fs"
 [[ "${ARCH}" =~ ^(armhf|arm)$ ]] && ARCH="armv7"
 [[ "${ARCH}" == "arm64" ]] && ARCH=aarch64
 [[ "${ARCH}" == "amd64" ]] && ARCH=x86_64