robin/cube
1
0
Fork 0
mirror of https://codeberg.org/icewind/cube.git synced 2026-06-03 12:04:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix serving files from readonly fs

Browse source
This commit is contained in:
Robin Appelman 2023-02-19 18:11:41 +01:00
commit 3bd95c98d2
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -112,7 +112,7 @@
environment.etc."nbs/nbs.toml".source = configFile;
networking.firewall.allowedTCPPorts = optional cfg.openPorts cfg.listen.port;
systemd.services.nbs = {
description = "NBD block server";

23
src/config.rs
View file

@ -103,16 +103,21 @@ impl ExportConfig {
err: e,
path: self.path.clone(),
})?;
let file = OpenOptions::new()
.read(true)
.write(!self.readonly)
.open(&self.path)
.map_err(|e| HandshakeError::Open {
err: e,
path: self.path.clone(),
})?;
let readonly = self.readonly || meta.permissions().readonly();
let mut opt = OpenOptions::new();
opt.read(true);
if !readonly {
opt.write(true);
}
let file = opt.open(&self.path).map_err(|e| HandshakeError::Open {
err: e,
path: self.path.clone(),
})?;
Ok(Export {
readonly: self.readonly || meta.permissions().readonly(),
readonly,
size: meta.len(),
data: file,
resizeable: false,