min
/
lanzaboote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #219 from tilpner/syncfs 

tool: only sync ESP filesystem
This commit is contained in:
Ryan Lahfa 2023-09-13 14:58:58 +00:00 committed by GitHub
parent 6d6cdf59b9 3895c94eb5
commit 9a9b09628b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rust/tool/src/install.rs
View File

@ -1,12 +1,13 @@
use std::collections::{BTreeMap, BTreeSet}; use std::collections::{BTreeMap, BTreeSet};
use std::fs; use std::fs::{self, File};
use std::os::fd::AsRawFd;
use std::os::unix::prelude::PermissionsExt; use std::os::unix::prelude::PermissionsExt;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::Command; use std::process::Command;
use std::string::ToString; use std::string::ToString;
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use nix::unistd::sync; use nix::unistd::syncfs;
use tempfile::TempDir; use tempfile::TempDir;
use crate::esp::{EspGenerationPaths, EspPaths}; use crate::esp::{EspGenerationPaths, EspPaths};
@ -110,8 +111,8 @@ impl Installer {
Garbage collection is disabled because you have malformed NixOS generations that do Garbage collection is disabled because you have malformed NixOS generations that do
not contain a readable bootspec document. not contain a readable bootspec document.
Remove the malformed generations to re-enable garbage collection with Remove the malformed generations to re-enable garbage collection with
`nix-env --delete-generations {}` `nix-env --delete-generations {}`
", self.broken_gens.iter().map(ToString::to_string).collect::<Vec<String>>().join(" ")}; ", self.broken_gens.iter().map(ToString::to_string).collect::<Vec<String>>().join(" ")};
log::warn!("{warning}"); log::warn!("{warning}");
}; };
@ -161,7 +162,8 @@ impl Installer {
// Sync files to persistent storage. This may improve the // Sync files to persistent storage. This may improve the
// chance of a consistent boot directory in case the system // chance of a consistent boot directory in case the system
// crashes. // crashes.
sync(); let boot = File::open(&self.esp_paths.esp).context("Failed to open ESP root directory.")?;
syncfs(boot.as_raw_fd()).context("Failed to sync ESP filesystem.")?;
Ok(()) Ok(())
} }