From 29351ebeb195573b43de6f306831397a0e235b62 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Fri, 14 Feb 2020 23:18:49 +0100 Subject: [PATCH] remove always reboot on migration --- home.admin/00raspiblitz.sh | 2 -- home.admin/config.scripts/blitz.migration.sh | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh index f562e07bb..046e5d5da 100755 --- a/home.admin/00raspiblitz.sh +++ b/home.admin/00raspiblitz.sh @@ -418,8 +418,6 @@ case $CHOICE in ;; MIGRATION) sudo /home/admin/config.scripts/blitz.migration.sh "import-gui" - echo "PRESS ENTER to continue/reboot" - sudo shutdown -r now exit 0 ;; X) diff --git a/home.admin/config.scripts/blitz.migration.sh b/home.admin/config.scripts/blitz.migration.sh index c4842d4b7..bf1e82bb8 100644 --- a/home.admin/config.scripts/blitz.migration.sh +++ b/home.admin/config.scripts/blitz.migration.sh @@ -15,18 +15,13 @@ if [ "$EUID" -ne 0 ]; then exit 1 fi -# check if data drive is mounted - other wise cannot operate -isMounted=$(sudo df | grep -c /mnt/hdd) -if [ ${isMounted} -eq 0 ]; then - echo "# FAIL check why /mnt/hdd is not available/mounted" - echo "error='datadrive not found'" - exit 1 -fi - ################### # STATUS ################### +# check if data drive is mounted - other wise cannot operate +isMounted=$(sudo df | grep -c /mnt/hdd) + # gathering system info isBTRFS=$(lsblk -o FSTYPE,MOUNTPOINT | grep /mnt/hdd | awk '$1=$1' | cut -d " " -f 1 | grep -c btrfs)