highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-09-28 04:26:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

react to error

Browse Source
This commit is contained in:
rootzoll
2021-09-29 13:07:24 +02:00
parent cf3962c1ad
commit 48a5588cb5
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
home.admin/00raspiblitz.sh
View File

@@ -242,18 +242,29 @@ do
echo "***********************************************************" echo "***********************************************************"
exit 1 exit 1
fi fi
error
# for all critical errors (admin info & exit) # for all critical errors (admin info & exit)
if [ "${state}" == "error" ] || [ "${state}" == "errorHDD" ]; then
clear
echo "###########################################################"
echo "# /home/admin/raspiblitz.log"
cat /home/admin/raspiblitz.log
if [ "${state}" == "errorHDD" ]; then if [ "${state}" == "errorHDD" ]; then
echo "***********************************************************" # print some debug detail info on HDD/SSD error
echo "SETUP ERROR - please report to development team" echo "###########################################################"
echo "***********************************************************" echo "# blitz.datadrive.sh status"
echo "state(${state}) message(${message})" sudo /home/admin/config.scripts/blitz.datadrive.sh status
if [ "${state}" == "errorHDD" ]; then fi
if [ "${message}" == "_provision.setup.sh fail" ]; then
# print some debug detail info on HDD/SSD error # print some debug detail info on HDD/SSD error
echo "# blitz.datadrive.sh status" echo "# blitz.datadrive.sh status"
sudo /home/admin/config.scripts/blitz.datadrive.sh status sudo /home/admin/config.scripts/blitz.datadrive.sh status
fi fi
echo "***********************************************************"
echo "ERROR - please report to development team"
echo "***********************************************************"
echo "state(${state}) message(${message})"
echo "https://github.com/rootzoll/raspiblitz#support"
echo "command to shutdown --> off" echo "command to shutdown --> off"
exit 1 exit 1
else else

11
home.admin/_bootstrap.sh
View File

@@ -543,8 +543,8 @@ if [ ${isMounted} -eq 0 ]; then
echo "the provision process was started but did not finish yet" > /home/admin/provision.flag echo "the provision process was started but did not finish yet" > /home/admin/provision.flag
# make HDD is still temp mounted # make HDD is still temp mounted
source <(/home/admin/config.scripts/blitz.datadrive.sh status)
echo "Temp mounting (2) data drive ($hddCandidate)" >> $logFile echo "Temp mounting (2) data drive ($hddCandidate)" >> $logFile
source <(/home/admin/config.scripts/internet.sh status)
if [ "${hddFormat}" != "btrfs" ]; then if [ "${hddFormat}" != "btrfs" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate}) source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
else else
@@ -552,6 +552,13 @@ if [ ${isMounted} -eq 0 ]; then
fi fi
echo "Temp mounting (2) result: ${isMounted}" >> $logFile echo "Temp mounting (2) result: ${isMounted}" >> $logFile
# check that HDD was temp mounted
if [ "${isMounted}" != "1"]; then
sed -i "s/^state=.*/state=errorHDD/g" ${infoFile}
sed -i "s/^message=.*/message='Was not able to mount HDD (2)'/g" ${infoFile}
exit 1
fi
# make sure all links between directories/drives are correct # make sure all links between directories/drives are correct
echo "Refreshing links between directories/drives .." >> $logFile echo "Refreshing links between directories/drives .." >> $logFile
sudo /home/admin/config.scripts/blitz.datadrive.sh link sudo /home/admin/config.scripts/blitz.datadrive.sh link
@@ -572,7 +579,7 @@ if [ ${isMounted} -eq 0 ]; then
cat ${configFile} >> ${logFile} cat ${configFile} >> ${logFile}
echo "# Sourcing ${setupFile} " >> ${logFile} echo "# Sourcing ${setupFile} " >> ${logFile}
source ${setupFile} source ${setupFile}
cat ${setupFile} >> ${logFile} sed -e '/^password/d' ${setupFile} >> ${logFile}
# make sure basic info is in raspiblitz.info # make sure basic info is in raspiblitz.info
echo "# Update ${infoFile} " >> ${logFile} echo "# Update ${infoFile} " >> ${logFile}