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

make sure of temp mount

Browse Source
This commit is contained in:
rootzoll
2021-09-05 15:05:45 +02:00
parent b00aada2f4
commit 9eb8b8c160
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
home.admin/_bootstrap.sh
View File

@@ -383,12 +383,13 @@ echo "HDD already part of system: $isMounted" >> $logFile
if [ ${isMounted} -eq 0 ]; then if [ ${isMounted} -eq 0 ]; then
# temp mount the HDD # temp mount the HDD
echo "Temp mounting data drive ($hddCandidate)" >> $logFile echo "Temp mounting (1) data drive ($hddCandidate)" >> $logFile
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
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate}) source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
fi fi
echo "Temp mounting (1) result: ${isMounted}" >> $logFile
# write data needed for setup process into raspiblitz.info # write data needed for setup process into raspiblitz.info
echo "hddCandidate='${hddCandidate}'" >> ${infoFile} echo "hddCandidate='${hddCandidate}'" >> ${infoFile}
@@ -483,6 +484,16 @@ if [ ${isMounted} -eq 0 ]; then
# mark system on sd card as in setup process # mark system on sd card as in setup process
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
echo "Temp mounting (2) data drive ($hddCandidate)" >> $logFile
source <(/home/admin/config.scripts/internet.sh status)
if [ "${hddFormat}" != "btrfs" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
else
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
fi
echo "Temp mounting (2) result: ${isMounted}" >> $logFile
# 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

2
home.admin/_provision.setup.sh
View File

@@ -78,7 +78,7 @@ sudo cp /home/admin/assets/${network}.conf /home/admin/.${network}/${network}.co
sudo chown -R admin:admin /home/admin/.${network} >>${logFile} 2>&1 sudo chown -R admin:admin /home/admin/.${network} >>${logFile} 2>&1
# make sure all directories are linked # make sure all directories are linked
sudo /home/admin/config.scripts/blitz.datadrive.sh link sudo /home/admin/config.scripts/blitz.datadrive.sh link >> ${logFile}
# test bitcoin config # test bitcoin config
confExists=$(sudo ls /mnt/hdd/${network}/${network}.conf | grep -c "${network}.conf") confExists=$(sudo ls /mnt/hdd/${network}/${network}.conf | grep -c "${network}.conf")