heierbtc/citadel-core
1
0
Fork 0
forked from michael.heier/citadel-core
Code Issues Pull Requests Projects Releases Wiki Activity

That should fix the upgrade

Browse Source
This commit is contained in:
Aaron Dewes 2021-10-30 21:39:03 +01:00 committed by GitHub
parent ee2e03e357
commit 1da9252526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/citadel-os/external-storage/mount
View File

@ -244,12 +244,10 @@ main () {
fi
echo "Bind mounting external storage over local Citadel installation..."
SHOULD_UPGRADE=0
# If EXTERNAL_UMBREL_ROOT exists, move it to EXTERNAL_CITADEL_ROOT
if [[ -d "${EXTERNAL_UMBREL_ROOT}" ]]; then
mv "${EXTERNAL_UMBREL_ROOT}" "${EXTERNAL_CITADEL_ROOT}"
touch "${EXTERNAL_CITADEL_ROOT}"/.citadel
SHOULD_UPGRADE=1
fi
mount --bind "${EXTERNAL_CITADEL_ROOT}" "${CITADEL_ROOT}"
@ -289,10 +287,6 @@ main () {
echo
${CITADEL_ROOT}/scripts/citadel-os/external-storage/monitor ${block_device} ${MOUNT_POINT} &
if [[ ${SHOULD_UPGRADE} -eq 1 ]]; then
echo "Upgrading Citadel..."
"${CITADEL_ROOT}/scripts/update/update" --path "${EXTERNAL_CITADEL_ROOT}"
fi
echo "Mount script completed successfully!"
}