vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve D-Bus desktop service daemons (polkit, sessiond, udisks, upower)

Browse Source 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
Vasilito
2026-04-18 00:48:58 +01:00
parent 8ca7e02398
commit 92628166e3
5 changed files with 229 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/recipes/system/redbear-udisks/source/src/inventory.rs
+9 -13
View File
@@ -101,9 +101,7 @@ impl Inventory {
for (root_key, entry_name) in roots {
let device_path = format!("{}/{entry_name}", scheme_path.display());
let Some(metadata) = read_device_metadata(Path::new(&device_path)) else {
continue;
};
let metadata = read_device_metadata(Path::new(&device_path));
let drive = DriveDevice {
object_path: owned_object_path(&format!(
@@ -111,7 +109,7 @@ impl Inventory {
stable_object_name(&scheme_name, &entry_name)
)),
scheme_identity: scheme_identity.clone(),
size: metadata.size,
size: metadata.as_ref().map_or(0, |m| m.size),
};
drive_paths.insert(root_key, drive.object_path.clone());
@@ -123,9 +121,9 @@ impl Inventory {
)),
drive_object_path: drive.object_path.clone(),
device_path,
size: metadata.size,
logical_block_size: metadata.logical_block_size,
read_only: metadata.read_only,
size: metadata.as_ref().map_or(0, |m| m.size),
logical_block_size: metadata.as_ref().map_or(0, |m| m.logical_block_size),
read_only: metadata.as_ref().map_or(false, |m| m.read_only),
hint_partitionable: true,
});
@@ -141,9 +139,7 @@ impl Inventory {
};
let device_path = format!("{}/{entry_name}", scheme_path.display());
let Some(metadata) = read_device_metadata(Path::new(&device_path)) else {
continue;
};
let metadata = read_device_metadata(Path::new(&device_path));
blocks.push(BlockDevice {
object_path: owned_object_path(&format!(
@@ -152,9 +148,9 @@ impl Inventory {
)),
drive_object_path: drive_object_path.clone(),
device_path,
size: metadata.size,
logical_block_size: metadata.logical_block_size,
read_only: metadata.read_only,
size: metadata.as_ref().map_or(0, |m| m.size),
logical_block_size: metadata.as_ref().map_or(0, |m| m.logical_block_size),
read_only: metadata.as_ref().map_or(false, |m| m.read_only),
hint_partitionable: false,
});
}
local/recipes/system/redbear-udisks/source/src/main.rs
+57 -42
View File
@@ -4,8 +4,11 @@ mod inventory;
use std::{
env,
error::Error,
path::Path,
process,
sync::Arc,
thread,
time::Duration,
};
use interfaces::{BlockDeviceInterface, DriveInterface, ObjectManagerRoot, UDisksManager};
@@ -28,6 +31,21 @@ fn usage() -> &'static str {
"Usage: redbear-udisks [--help]"
}
async fn wait_for_dbus_socket() {
let socket_path = env::var("DBUS_STARTER_ADDRESS")
.ok()
.and_then(|addr| addr.strip_prefix("unix:path=").map(String::from))
.unwrap_or_else(|| "/run/dbus/system_bus_socket".to_string());
for _ in 0..30 {
if tokio::net::UnixStream::connect(&socket_path).await.is_ok() {
return;
}
tokio::time::sleep(Duration::from_secs(1)).await;
}
eprintln!("redbear-udisks: timed out waiting for D-Bus socket at {socket_path}");
}
fn parse_args() -> Result<Command, String> {
let mut args = env::args().skip(1);
@@ -82,51 +100,48 @@ async fn wait_for_shutdown() -> Result<(), Box<dyn Error>> {
}
async fn run_daemon() -> Result<(), Box<dyn Error>> {
eprintln!("redbear-udisks: startup begin");
let _root_path = parse_object_path(ROOT_PATH)?;
let _manager_path = parse_object_path(MANAGER_PATH)?;
eprintln!("redbear-udisks: object paths parsed");
let inventory = Arc::new(Inventory::scan());
eprintln!(
"redbear-udisks: inventory scanned drives={} blocks={}",
inventory.drives().len(),
inventory.blocks().len()
);
let block_sizes_known = inventory
.blocks()
.iter()
.filter(|block| block.logical_block_size > 0)
.count();
wait_for_dbus_socket().await;
eprintln!("redbear-udisks: starter address={:?}", env::var("DBUS_STARTER_ADDRESS").ok());
eprintln!("redbear-udisks: building D-Bus connection");
let mut builder = system_connection_builder()?
.name(BUS_NAME)?
.serve_at(ROOT_PATH, ObjectManagerRoot::new(inventory.clone()))?
.serve_at(MANAGER_PATH, UDisksManager::new(inventory.clone()))?;
let mut last_err = None;
for attempt in 1..=5 {
let _root_path = parse_object_path(ROOT_PATH)?;
let _manager_path = parse_object_path(MANAGER_PATH)?;
let inventory = Arc::new(Inventory::scan());
for drive in inventory.drives() {
builder = builder.serve_at(drive.object_path.as_str(), DriveInterface::new(drive.clone()))?;
let mut builder = system_connection_builder()?
.name(BUS_NAME)?
.serve_at(ROOT_PATH, ObjectManagerRoot::new(inventory.clone()))?
.serve_at(MANAGER_PATH, UDisksManager::new(inventory.clone()))?;
for drive in inventory.drives() {
builder = builder.serve_at(drive.object_path.as_str(), DriveInterface::new(drive.clone()))?;
}
for block in inventory.blocks() {
builder = builder.serve_at(block.object_path.as_str(), BlockDeviceInterface::new(block.clone()))?;
}
match builder.build().await {
Ok(connection) => {
eprintln!(
"redbear-udisks: registered {BUS_NAME} on the system bus ({} drives, {} blocks)",
inventory.drives().len(),
inventory.blocks().len(),
);
wait_for_shutdown().await?;
drop(connection);
return Ok(());
}
Err(err) => {
if attempt < 5 {
eprintln!("redbear-udisks: attempt {attempt}/5 failed ({err}), retrying in 2s...");
tokio::time::sleep(Duration::from_secs(2)).await;
}
last_err = Some(err.into());
}
}
}
for block in inventory.blocks() {
builder = builder.serve_at(block.object_path.as_str(), BlockDeviceInterface::new(block.clone()))?;
}
let connection = builder.build().await?;
eprintln!(
"redbear-udisks: registered {BUS_NAME} on the system bus with {} drives, {} block devices, {} metadata-backed block sizes",
inventory.drives().len(),
inventory.blocks().len(),
block_sizes_known,
);
wait_for_shutdown().await?;
drop(connection);
eprintln!("redbear-udisks: received shutdown signal, exiting cleanly");
Ok(())
Err(last_err.unwrap())
}
fn main() {