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

simplify tempmount

Browse Source
This commit is contained in:
rootzoll
2022-01-17 11:32:07 +01:00
parent 50e27348db
commit ddaf4d7c2f
2 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
home.admin/_bootstrap.sh
View File

@@ -407,12 +407,8 @@ echo "HDD already part of system: $isMounted" >> $logFile
if [ ${isMounted} -eq 0 ]; then
# temp mount the HDD
echo "Temp mounting (1) data drive ($hddCandidate)" >> $logFile
if [ "${hddFormat}" != "btrfs" ]; then
source <(/home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
else
source <(/home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
fi
echo "Temp mounting (1) data drive" >> $logFile
source <(/home/admin/config.scripts/blitz.datadrive.sh tempmount)
echo "Temp mounting (1) result: ${isMounted}" >> $logFile
# write data needed for setup process into raspiblitz.info
@@ -511,12 +507,8 @@ if [ ${isMounted} -eq 0 ]; then
# make sure HDD is mounted (could be freshly formatted by user on last loop)
source <(/home/admin/config.scripts/blitz.datadrive.sh status)
echo "Temp mounting (2) 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
echo "Temp mounting (2) data drive (hddFormat='${hddFormat}')" >> ${logFile}
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount)
echo "Temp mounting (2) result: ${isMounted}" >> ${logFile}
# check that HDD was temp mounted

21
home.admin/config.scripts/blitz.migration.sh
View File

@@ -108,14 +108,13 @@ migrate_raspiblitz_conf () {
if [ "$1" = "migration-umbrel" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
# make sure data drive is mounted
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
if [ "${isMounted}" != "1" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount)
fi
if [ "${isMounted}" == "1" ]; then
echo "# mounted ${hddPartitionCandidate} to /mnt/hdd"
echo "# mounted /mnt/hdd (hddFormat='${hddFormat}')"
else
echo "err='failed temp mounting disk'"
exit 1
@@ -189,14 +188,13 @@ fi
if [ "$1" = "migration-citadel" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
# make sure data drive is mounted
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
if [ "${isMounted}" != "1" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount)
fi
if [ "${isMounted}" == "1" ]; then
echo "# mounted ${hddPartitionCandidate} to /mnt/hdd"
echo "# mounted /mnt/hdd (hddFormat='${hddFormat}')"
else
echo "err='failed temp mounting disk'"
exit 1
@@ -265,14 +263,13 @@ fi
if [ "$1" = "migration-mynode" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
# make sure data drive is mounted
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
if [ "${isMounted}" != "1" ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount)
fi
if [ "${isMounted}" == "1" ]; then
echo "# mounted ${hddPartitionCandidate} to /mnt/hdd"
echo "# mounted /mnt/hdd (hddFormat='${hddFormat}')"
else
echo "err='failed temp mounting disk'"
exit 1