Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Cifs not working because rw (#2025)

Browse Source
This commit is contained in:
J M
2022-12-04 15:23:10 -07:00
committed by GitHub
parent 785ed480bb
commit bed37184d1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/backup/restore.rs
View File

@@ -22,7 +22,7 @@ use crate::backup::BackupMetadata;
use crate::context::{RpcContext, SetupContext}; use crate::context::{RpcContext, SetupContext};
use crate::db::model::{PackageDataEntry, StaticFiles}; use crate::db::model::{PackageDataEntry, StaticFiles};
use crate::disk::mount::backup::{BackupMountGuard, PackageBackupMountGuard}; use crate::disk::mount::backup::{BackupMountGuard, PackageBackupMountGuard};
use crate::disk::mount::filesystem::ReadOnly; use crate::disk::mount::filesystem::ReadWrite;
use crate::disk::mount::guard::TmpMountGuard; use crate::disk::mount::guard::TmpMountGuard;
use crate::hostname::{get_hostname, Hostname}; use crate::hostname::{get_hostname, Hostname};
use crate::install::progress::InstallProgress; use crate::install::progress::InstallProgress;
@@ -57,7 +57,7 @@ pub async fn restore_packages_rpc(
.load(&mut ctx.secret_store.acquire().await?) .load(&mut ctx.secret_store.acquire().await?)
.await?; .await?;
let backup_guard = let backup_guard =
BackupMountGuard::mount(TmpMountGuard::mount(&fs, ReadOnly).await?, &password).await?; BackupMountGuard::mount(TmpMountGuard::mount(&fs, ReadWrite).await?, &password).await?;
let (backup_guard, tasks, _) = restore_packages(&ctx, &mut db, backup_guard, ids).await?; let (backup_guard, tasks, _) = restore_packages(&ctx, &mut db, backup_guard, ids).await?;

4
backend/src/backup/target/mod.rs
View File

@@ -18,7 +18,7 @@ use crate::context::RpcContext;
use crate::disk::mount::backup::BackupMountGuard; use crate::disk::mount::backup::BackupMountGuard;
use crate::disk::mount::filesystem::block_dev::BlockDev; use crate::disk::mount::filesystem::block_dev::BlockDev;
use crate::disk::mount::filesystem::cifs::Cifs; use crate::disk::mount::filesystem::cifs::Cifs;
use crate::disk::mount::filesystem::{FileSystem, MountType, ReadOnly}; use crate::disk::mount::filesystem::{FileSystem, MountType, ReadWrite};
use crate::disk::mount::guard::TmpMountGuard; use crate::disk::mount::guard::TmpMountGuard;
use crate::disk::util::PartitionInfo; use crate::disk::util::PartitionInfo;
use crate::s9pk::manifest::PackageId; use crate::s9pk::manifest::PackageId;
@@ -234,7 +234,7 @@ pub async fn info(
&target_id &target_id
.load(&mut ctx.secret_store.acquire().await?) .load(&mut ctx.secret_store.acquire().await?)
.await?, .await?,
ReadOnly, ReadWrite,
) )
.await?, .await?,
&password, &password,

6
backend/src/setup.rs
View File

@@ -24,7 +24,7 @@ use crate::context::SetupContext;
use crate::disk::fsck::RepairStrategy; use crate::disk::fsck::RepairStrategy;
use crate::disk::main::DEFAULT_PASSWORD; use crate::disk::main::DEFAULT_PASSWORD;
use crate::disk::mount::filesystem::cifs::Cifs; use crate::disk::mount::filesystem::cifs::Cifs;
use crate::disk::mount::filesystem::ReadOnly; use crate::disk::mount::filesystem::ReadWrite;
use crate::disk::mount::guard::TmpMountGuard; use crate::disk::mount::guard::TmpMountGuard;
use crate::disk::util::{pvscan, recovery_info, DiskInfo, EmbassyOsRecoveryInfo}; use crate::disk::util::{pvscan, recovery_info, DiskInfo, EmbassyOsRecoveryInfo};
use crate::disk::REPAIR_DISK_PATH; use crate::disk::REPAIR_DISK_PATH;
@@ -223,7 +223,7 @@ pub async fn verify_cifs(
username, username,
password, password,
}, },
ReadOnly, ReadWrite,
) )
.await?; .await?;
let embassy_os = recovery_info(&guard).await?; let embassy_os = recovery_info(&guard).await?;
@@ -422,7 +422,7 @@ async fn recover(
recovery_source: BackupTargetFS, recovery_source: BackupTargetFS,
recovery_password: Option<String>, recovery_password: Option<String>,
) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> { ) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
let recovery_source = TmpMountGuard::mount(&recovery_source, ReadOnly).await?; let recovery_source = TmpMountGuard::mount(&recovery_source, ReadWrite).await?;
recover_full_embassy( recover_full_embassy(
ctx.clone(), ctx.clone(),
guid.clone(), guid.clone(),