fix(install): accept loaded kernel modules
This commit is contained in:
parent
29213e41df
commit
d5b1ecaae1
6
Cargo.lock
generated
6
Cargo.lock
generated
@ -1658,7 +1658,7 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
|
||||
|
||||
[[package]]
|
||||
name = "lesavka_client"
|
||||
version = "0.27.5"
|
||||
version = "0.27.6"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-stream",
|
||||
@ -1692,7 +1692,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lesavka_common"
|
||||
version = "0.27.5"
|
||||
version = "0.27.6"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
@ -1704,7 +1704,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lesavka_server"
|
||||
version = "0.27.5"
|
||||
version = "0.27.6"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
|
||||
@ -4,7 +4,7 @@ path = "src/main.rs"
|
||||
|
||||
[package]
|
||||
name = "lesavka_client"
|
||||
version = "0.27.5"
|
||||
version = "0.27.6"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "lesavka_common"
|
||||
version = "0.27.5"
|
||||
version = "0.27.6"
|
||||
edition = "2024"
|
||||
build = "build.rs"
|
||||
|
||||
|
||||
@ -261,7 +261,7 @@ report_client_media_acceleration() {
|
||||
require_kernel_module() {
|
||||
local module=$1
|
||||
local why=$2
|
||||
if modinfo "$module" >/dev/null 2>&1; then
|
||||
if [[ -d "/sys/module/${module}" ]] || modinfo "$module" >/dev/null 2>&1; then
|
||||
return 0
|
||||
fi
|
||||
local running_kernel
|
||||
|
||||
@ -16,7 +16,7 @@ bench = false
|
||||
|
||||
[package]
|
||||
name = "lesavka_server"
|
||||
version = "0.27.5"
|
||||
version = "0.27.6"
|
||||
edition = "2024"
|
||||
autobins = false
|
||||
|
||||
|
||||
@ -156,6 +156,14 @@ fn client_install_reports_nvidia_and_open_source_media_routes() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn client_install_accepts_required_modules_already_loaded_by_the_running_kernel() {
|
||||
assert!(
|
||||
CLIENT_INSTALL.contains("[[ -d \"/sys/module/${module}\" ]] || modinfo"),
|
||||
"installer should not reject a working loaded module just because a newer package replaced the running kernel's module tree"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn client_install_treats_pipewire_as_one_coherent_transaction() {
|
||||
for expected in [
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user