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

Fix for btrfs migration with raid (usb drive) does not work (#1697)

Browse Source
This commit is contained in:
Holger Nahrstaedt
2020-11-01 11:24:12 +01:00
committed by rootzoll
parent 9b58b55971
commit 3f2ee2e1e1
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
home.admin/_bootstrap.provision.sh
View File

@@ -600,7 +600,11 @@ source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status)
# update /etc/fstab # update /etc/fstab
echo "datadisk --> ${datadisk}" >> ${logFile} echo "datadisk --> ${datadisk}" >> ${logFile}
echo "datapartition --> ${datapartition}" >> ${logFile} echo "datapartition --> ${datapartition}" >> ${logFile}
if [ ${isBTRFS} -eq 0 ]; then
sudo /home/admin/config.scripts/blitz.datadrive.sh fstab ${datapartition} >> ${logFile} sudo /home/admin/config.scripts/blitz.datadrive.sh fstab ${datapartition} >> ${logFile}
else
sudo /home/admin/config.scripts/blitz.datadrive.sh fstab ${datadisk} >> ${logFile}
fi
echo "DONE - Give raspi some cool off time after hard building .... 5 secs sleep" >> ${logFile} echo "DONE - Give raspi some cool off time after hard building .... 5 secs sleep" >> ${logFile}
sleep 5 sleep 5

4
home.admin/_bootstrap.sh
View File

@@ -322,7 +322,11 @@ if [ ${isMounted} -eq 0 ]; then
# temp mount the HDD # temp mount the HDD
echo "Temp mounting data drive ($hddCandidate)" >> $logFile echo "Temp mounting data drive ($hddCandidate)" >> $logFile
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
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
fi
if [ ${#error} -gt 0 ]; then if [ ${#error} -gt 0 ]; then
echo "Failed to tempmount the HDD .. awaiting user setup." >> $logFile echo "Failed to tempmount the HDD .. awaiting user setup." >> $logFile
sed -i "s/^state=.*/state=waitsetup/g" ${infoFile} sed -i "s/^state=.*/state=waitsetup/g" ${infoFile}

3
home.admin/config.scripts/blitz.datadrive.sh
View File

@@ -115,11 +115,14 @@ if [ "$1" = "status" ]; then
fi fi
fi fi
else else
# make sure to use the biggest
if [ ${testsize} -gt ${sizeDataPartition} ]; then
# Partion to be created is smaller than disk so this is not correct (but close) # Partion to be created is smaller than disk so this is not correct (but close)
sizeDataPartition=$(sudo fdisk -l /dev/$testdevice | grep GiB | cut -d " " -f 5) sizeDataPartition=$(sudo fdisk -l /dev/$testdevice | grep GiB | cut -d " " -f 5)
hddDataPartition="${testdevice}1" hddDataPartition="${testdevice}1"
hdd="${testdevice}" hdd="${testdevice}"
fi fi
fi
done < .lsblk.tmp done < .lsblk.tmp
rm -f .lsblk.tmp 1>/dev/null 2>/dev/null rm -f .lsblk.tmp 1>/dev/null 2>/dev/null

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

@@ -317,7 +317,11 @@ if [ "$1" = "import-gui" ]; then
esac esac
# now temp mount the HDD/SSD # now temp mount the HDD/SSD
if [ ${isBTRFS} -eq 0 ]; then
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate}) source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
else
source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
fi
if [ ${#error} -gt 0 ]; then if [ ${#error} -gt 0 ]; then
echo "FAIL: Was not able to temp mount the HDD/SSD --> ${error}" echo "FAIL: Was not able to temp mount the HDD/SSD --> ${error}"
exit 1 exit 1