From addd0a8bec9dde406fa80075226a374e7b0ba868 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Sat, 20 May 2017 12:42:35 +0200 Subject: [PATCH] check destination filesystem in nc-datadir nc-databasedir --- etc/nextcloudpi-config.d/nc-database.sh | 11 +++++++++++ etc/nextcloudpi-config.d/nc-datadir.sh | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/etc/nextcloudpi-config.d/nc-database.sh b/etc/nextcloudpi-config.d/nc-database.sh index ce6c09177..7f4da8427 100755 --- a/etc/nextcloudpi-config.d/nc-database.sh +++ b/etc/nextcloudpi-config.d/nc-database.sh @@ -18,6 +18,15 @@ DBDIR_=/media/USBdrive/ncdatabase DESCRIPTION="Move your database to a new location, like a USB drive" +show_info() +{ + whiptail --yesno \ + --backtitle "NextCloudPi configuration" \ + --title "Info" \ +"Note that non Unix filesystems such as NTFS are not supported +because they do not provide a compatible user/permissions system" \ + 20 90 +} configure() { @@ -35,6 +44,8 @@ configure() local BASEDIR=$( dirname "$DBDIR_" ) mkdir -p "$BASEDIR" + grep -q ext <( stat -fc%T $BASEDIR ) || { echo -e "Only ext filesystems can hold the database"; sleep 3; return 1; } + [[ $( stat -fc%d / ) == $( stat -fc%d $BASEDIR ) ]] && \ echo -e "INFO: moving database to another place in the same SD card\nIf you want to use an external mount, make sure it is properly set up" diff --git a/etc/nextcloudpi-config.d/nc-datadir.sh b/etc/nextcloudpi-config.d/nc-datadir.sh index dd17901fd..343741cbe 100755 --- a/etc/nextcloudpi-config.d/nc-datadir.sh +++ b/etc/nextcloudpi-config.d/nc-datadir.sh @@ -18,6 +18,16 @@ DATADIR_=/media/USBdrive/ncdata DESCRIPTION="Change your data dir to a new location, like a USB drive" +show_info() +{ + whiptail --yesno \ + --backtitle "NextCloudPi configuration" \ + --title "Info" \ +"Note that non Unix filesystems such as NTFS are not supported +because they do not provide a compatible user/permissions system" \ + 20 90 +} + configure() { local SRCDIR=$( cd /var/www/nextcloud; sudo -u www-data php occ config:system:get datadirectory ) @@ -34,6 +44,8 @@ configure() local BASEDIR=$( dirname "$DATADIR_" ) mkdir -p "$BASEDIR" + grep -q ext <( stat -fc%T $BASEDIR ) || { echo -e "Only ext filesystems can hold the data directory"; sleep 3; return 1; } + [[ $( stat -fc%d / ) == $( stat -fc%d $BASEDIR ) ]] && \ echo -e "INFO: moving data dir to another place in the same SD card\nIf you want to use an external mount, make sure it is properly set up"