mirror of
https://github.com/raspiblitz/raspiblitz.git
synced 2025-09-23 18:02:13 +02:00
add dataInspectDone info
This commit is contained in:
@@ -80,6 +80,7 @@ if [ "$1" = "layout" ]; then
|
|||||||
# scenario could be: unknown, recover, fresh
|
# scenario could be: unknown, recover, fresh
|
||||||
scenario="unknown"
|
scenario="unknown"
|
||||||
storageBlockchainGB=0
|
storageBlockchainGB=0
|
||||||
|
dataInspectDone=0
|
||||||
|
|
||||||
# initial values for drives & state to determine
|
# initial values for drives & state to determine
|
||||||
storageDevice=""
|
storageDevice=""
|
||||||
@@ -129,7 +130,7 @@ if [ "$1" = "layout" ]; then
|
|||||||
needsUnmount=1
|
needsUnmount=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
runDataInspect=0
|
dataInspectPartition=0
|
||||||
deviceName=$(echo "${name}" | sed -E 's/p?[0-9]+$//')
|
deviceName=$(echo "${name}" | sed -E 's/p?[0-9]+$//')
|
||||||
echo "# Checking partition ${name} (${size}GB) on ${deviceName} mounted at ${mountPath}"
|
echo "# Checking partition ${name} (${size}GB) on ${deviceName} mounted at ${mountPath}"
|
||||||
|
|
||||||
@@ -148,7 +149,7 @@ if [ "$1" = "layout" ]; then
|
|||||||
# check if its a combined data & storage partition
|
# check if its a combined data & storage partition
|
||||||
if [ -d "${mountPath}/app-data" ]; then
|
if [ -d "${mountPath}/app-data" ]; then
|
||||||
combinedDataStorage=1
|
combinedDataStorage=1
|
||||||
runDataInspect=1
|
dataInspectPartition=1
|
||||||
else
|
else
|
||||||
combinedDataStorage=0
|
combinedDataStorage=0
|
||||||
fi
|
fi
|
||||||
@@ -176,7 +177,7 @@ if [ "$1" = "layout" ]; then
|
|||||||
|
|
||||||
# set data
|
# set data
|
||||||
echo "# L> DATA partition"
|
echo "# L> DATA partition"
|
||||||
runDataInspect=1
|
dataInspectPartition=1
|
||||||
dataDevice="${deviceName}"
|
dataDevice="${deviceName}"
|
||||||
dataSizeGB="${size}"
|
dataSizeGB="${size}"
|
||||||
dataPartition="${name}"
|
dataPartition="${name}"
|
||||||
@@ -207,17 +208,16 @@ if [ "$1" = "layout" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Datainspect: copy setup relevant data from partition to temp location
|
# Datainspect: copy setup relevant data from partition to temp location
|
||||||
if [ "$runDataInspect" = "1" ]; then
|
if [ "$dataInspectPartition" = "1" ]; then
|
||||||
|
|
||||||
echo "# L> run data inspect - RAMDISK: /var/cache/raspiblitz/hdd-inspect"
|
|
||||||
|
|
||||||
# check that /var/cache/raspiblitz exists
|
|
||||||
if [ "$userWantsInspect" = "0" ]; then
|
if [ "$userWantsInspect" = "0" ]; then
|
||||||
echo "# L> skipping data inspect - use '-inspect' to copy data to RAMDISK for inspection"
|
echo "# L> skipping data inspect - use '-inspect' to copy data to RAMDISK for inspection"
|
||||||
elif [ ! -d "/var/cache/raspiblitz" ]; then
|
elif [ ! -d "/var/cache/raspiblitz" ]; then
|
||||||
echo "# L> skipping data inspect - RAMDISK not found"
|
echo "# L> skipping data inspect - RAMDISK not found"
|
||||||
else
|
else
|
||||||
|
|
||||||
|
echo "# L> run data inspect - RAMDISK: /var/cache/raspiblitz/hdd-inspect"
|
||||||
mkdir /var/cache/raspiblitz/hdd-inspect 2>/dev/null
|
mkdir /var/cache/raspiblitz/hdd-inspect 2>/dev/null
|
||||||
|
dataInspectDone=1
|
||||||
|
|
||||||
# make copy of raspiblitz.conf to RAMDISK (try old and new path)
|
# make copy of raspiblitz.conf to RAMDISK (try old and new path)
|
||||||
cp -a ${mountPath}/raspiblitz.conf /var/cache/raspiblitz/hdd-inspect/raspiblitz.conf 2>/dev/null
|
cp -a ${mountPath}/raspiblitz.conf /var/cache/raspiblitz/hdd-inspect/raspiblitz.conf 2>/dev/null
|
||||||
@@ -340,6 +340,7 @@ if [ "$1" = "layout" ]; then
|
|||||||
echo "dataSizeGB='${dataSizeGB}'"
|
echo "dataSizeGB='${dataSizeGB}'"
|
||||||
echo "dataPartition='${dataPartition}'"
|
echo "dataPartition='${dataPartition}'"
|
||||||
echo "dataMountedPath='${dataMountedPath}'"
|
echo "dataMountedPath='${dataMountedPath}'"
|
||||||
|
echo "dataInspectDone='${dataInspectDone}'"
|
||||||
echo "combinedDataStorage='${combinedDataStorage}'"
|
echo "combinedDataStorage='${combinedDataStorage}'"
|
||||||
echo "bootFromStorage='${bootFromStorage}'"
|
echo "bootFromStorage='${bootFromStorage}'"
|
||||||
echo "bootFromSD='${bootFromSD}'"
|
echo "bootFromSD='${bootFromSD}'"
|
||||||
|
Reference in New Issue
Block a user