diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-11-27 04:36:13 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-11-27 04:36:31 +0300 |
| commit | 88d9fe2ecc3e550ab70e78af388be77170250b1c (patch) | |
| tree | e8b3d6ea469ff37a88fd641fd1ffb73a3fd82335 | |
| parent | 5278bfd37fbd109cdfcd6ec1e0402d34803aa199 (diff) | |
nc-restore: check that we are in linux fsv0.67.4
| -rw-r--r-- | changelog.md | 6 | ||||
| -rw-r--r-- | etc/ncp-config.d/nc-restore.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changelog.md b/changelog.md index 84e6a35f..d784cd35 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v0.67.2](https://github.com/nextcloud/nextcloudpi/commit/868b576) (2018-11-26) change dialog text width to 120 +[v0.67.3](https://github.com/nextcloud/nextcloudpi/commit/d3c72cc) (2018-11-26) nc-datadir: shorten short description -[v0.67.1](https://github.com/nextcloud/nextcloudpi/commit/b0262f9) (2018-11-23) referrer policy already in .htaccess in NC14.0.4 +[v0.67.2 ](https://github.com/nextcloud/nextcloudpi/commit/5e4be44) (2018-11-26) change dialog text width to 120 + +[v0.67.1 ](https://github.com/nextcloud/nextcloudpi/commit/b0262f9) (2018-11-23) referrer policy already in .htaccess in NC14.0.4 [v0.67.0 ](https://github.com/nextcloud/nextcloudpi/commit/bcac4bc) (2018-11-22) upgrade to NC14.0.4 diff --git a/etc/ncp-config.d/nc-restore.sh b/etc/ncp-config.d/nc-restore.sh index ea6f1332..05de9db9 100644 --- a/etc/ncp-config.d/nc-restore.sh +++ b/etc/ncp-config.d/nc-restore.sh @@ -42,6 +42,8 @@ DIR="$( cd "$( dirname "$BACKUPFILE" )" &>/dev/null && pwd )" #abspath [[ "$DIR" =~ "$NCDIR" ]] && { echo "Refusing to restore from $NCDIR"; exit 1; } TMPDIR="$( mktemp -d "$( dirname "$BACKUPFILE" )"/ncp-restore.XXXXXX )" || { echo "Failed to create temp dir" >&2; exit 1; } +grep -q -e ext -e btrfs <( stat -fc%T "$TMPDIR" ) || { echo "Can only restore from ext/btrfs filesystems" >&2; exit 1; } + TMPDIR="$( cd "$TMPDIR" &>/dev/null && pwd )" || { echo "$TMPDIR not found"; exit 1; } #abspath cleanup(){ local RET=$?; echo "Cleanup..."; rm -rf "${TMPDIR}"; trap "" EXIT; exit $RET; } trap cleanup INT TERM HUP ERR EXIT |