mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-02-24 14:51:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

ssh temp mount earlier

Browse source
This commit is contained in:
rootzoll 2021-09-04 21:21:03 +02:00
parent 9760e11e52
commit b45d83b5c6
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
home.admin/_bootstrap.sh
View file

@ -372,6 +372,14 @@ echo "HDD already part of system: $isMounted" >> $logFile
if [ ${isMounted} -eq 0 ]; then if [ ${isMounted} -eq 0 ]; then
# temp mount the HDD
echo "Temp mounting data drive ($hddCandidate)" >> $logFile
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
# 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}
echo "hddBlocksBitcoin=${hddBlocksBitcoin}" >> ${infoFile} echo "hddBlocksBitcoin=${hddBlocksBitcoin}" >> ${infoFile}
@ -465,14 +473,6 @@ 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
# temp mount the HDD
echo "Temp mounting data drive ($hddCandidate)" >> $logFile
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
# 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
@ -488,7 +488,7 @@ if [ ${isMounted} -eq 0 ]; then
sed -i "s/^message=.*/message='Starting Provision'/g" ${infoFile} sed -i "s/^message=.*/message='Starting Provision'/g" ${infoFile}
# load setup data # load setup data
source ${setupFile} 2>$logFile source ${setupFile}
# make sure basic info id in raspiblitz.info # make sure basic info id in raspiblitz.info
sudo sed -i "s/^network=.*/network=${network}/g" ${infoFile} sudo sed -i "s/^network=.*/network=${network}/g" ${infoFile}

2
home.admin/config.scripts/blitz.ssh.sh
View file

@ -66,7 +66,7 @@ if [ "$1" = "checkrepair" ]; then
if [ ${countKeyFiles} -lt 8 ]; then if [ ${countKeyFiles} -lt 8 ]; then
echo "# FAIL: Was not able to generate new sshd host keys" echo "# FAIL: Was not able to generate new sshd host keys"
else else
echo "# OK: New sshd host leys generated" echo "# OK: New sshd host keys generated"
fi fi
fi fi