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

fix setup system

Browse Source
This commit is contained in:
rootzoll
2025-01-16 21:22:52 +01:00
parent 78ad01dfe8
commit b7a5c697c6
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
home.admin/config.scripts/blitz.data.sh
View File

@@ -276,7 +276,7 @@ if [ "$action" = "status" ]; then
else else
# system might run from SD card # system might run from SD card
bootFromStorage=0 bootFromStorage=0
# check if boot partition is on SD card (mmcblk) # check if boot partition is on SD card (mmcblk) - staus quo, might change thru proposed layout
bootFromSD=$(lsblk | grep mmcblk | grep -c /boot) bootFromSD=$(lsblk | grep mmcblk | grep -c /boot)
fi fi
@@ -500,14 +500,10 @@ if [ "$action" = "status" ]; then
elif [ ${#storageMountedPath} -gt 0 ] && [ ${#dataMountedPath} -gt 0 ] && [ ${#systemMountedPath} -gt 0 ]; then elif [ ${#storageMountedPath} -gt 0 ] && [ ${#dataMountedPath} -gt 0 ] && [ ${#systemMountedPath} -gt 0 ]; then
scenario="ready" scenario="ready"
# ready: RaspberryPi+BootNVMe, Laptop or VM with patched thru USB drive # ready: RaspberryPi, Laptop or VM with patched thru USB drive
elif [ ${#storageMountedPath} -gt 0 ] && [ ${combinedDataStorage} -eq 1 ]; then elif [ ${#storageMountedPath} -gt 0 ] && [ ${combinedDataStorage} -eq 1 ]; then
scenario="ready" scenario="ready"
# ready: Old RaspberryPi
elif [ ${#storageMountedPath} -gt 0 ] && [ ${combinedDataStorage} -eq 1 ] && [ ${bootFromSD} -eq 1 ] ; then
scenario="ready"
# recover: drives there but unmounted & blitz config exists (check raspiblitz.conf with -inspect if its update) # recover: drives there but unmounted & blitz config exists (check raspiblitz.conf with -inspect if its update)
elif [ ${#storageDevice} -gt 0 ] && [ ${#storageMountedPath} -eq 0 ] && [ ${dataConfigFound} -eq 1 ] && [ "${systemMountedPath}" != "/" ] && [ ${bootFromSD} -eq 0 ]; then elif [ ${#storageDevice} -gt 0 ] && [ ${#storageMountedPath} -eq 0 ] && [ ${dataConfigFound} -eq 1 ] && [ "${systemMountedPath}" != "/" ] && [ ${bootFromSD} -eq 0 ]; then
scenario="recover:system" # auto update system before recover scenario="recover:system" # auto update system before recover
@@ -517,7 +513,7 @@ if [ "$action" = "status" ]; then
scenario="recover" scenario="recover"
# setup: drives there but unmounted & no blitz config exists & booted from install media # setup: drives there but unmounted & no blitz config exists & booted from install media
elif [ ${#storageDevice} -gt 0 ] && [ ${#storageMountedPath} -eq 0 ] && [ ${dataConfigFound} -eq 0 ] && [ "${systemMountedPath}" != "/" ]; then elif [ ${#storageDevice} -gt 0 ] && [ ${#storageMountedPath} -eq 0 ] && [ ${dataConfigFound} -eq 0 ] && [ "${systemMountedPath}" != "/" ] && [ ${bootFromSD} -eq 0 ]; then
scenario="setup:system" # ask user to change bootdrive before setup scenario="setup:system" # ask user to change bootdrive before setup
# setup: drives there but unmounted & no blitz config exists # setup: drives there but unmounted & no blitz config exists