From 5ab2ddf2677256d6aaa6aabe97c497ecd8d4fe7b Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 15 Feb 2022 17:13:12 -0700
Subject: [PATCH] fix backup completion on `unstable`

---
 backend/src/backup/backup_bulk.rs | 4 ++++
 backend/src/context/rpc.rs        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/src/backup/backup_bulk.rs b/backend/src/backup/backup_bulk.rs
index b37c06c98..b249a3854 100644
--- a/backend/src/backup/backup_bulk.rs
+++ b/backend/src/backup/backup_bulk.rs
@@ -356,6 +356,10 @@ async fn perform_backup<Db: DbHandle>(
         tx.save().await?;
     }
 
+    crate::db::DatabaseModel::new()
+        .lock(&mut db, LockType::Write)
+        .await?;
+
     let (root_ca_key, root_ca_cert) = ctx.net_controller.ssl.export_root_ca().await?;
     let mut os_backup_file = AtomicFile::new(backup_guard.as_ref().join("os-backup.cbor")).await?;
     os_backup_file
diff --git a/backend/src/context/rpc.rs b/backend/src/context/rpc.rs
index 935a7e7c3..9964a9cb2 100644
--- a/backend/src/context/rpc.rs
+++ b/backend/src/context/rpc.rs
@@ -15,7 +15,7 @@ use rpc_toolkit::url::Host;
 use rpc_toolkit::Context;
 use serde::Deserialize;
 use sqlx::sqlite::SqliteConnectOptions;
-use sqlx::{Acquire, SqlitePool};
+use sqlx::SqlitePool;
 use tokio::fs::File;
 use tokio::process::Command;
 use tokio::sync::{broadcast, oneshot, Mutex, RwLock};