This commit is contained in:
@@ -101,6 +101,20 @@ fn ethernet_connected() -> bool {
|
||||
.iter()
|
||||
.any(|(_, kind, carrier, _)| kind == "LAN/other" && carrier == "1")
|
||||
}
|
||||
fn mobile_device() -> bool {
|
||||
let chassis = read_trim("/sys/class/dmi/id/chassis_type")
|
||||
.or_else(|| read_trim("/run/csr-intake/chassis_type"))
|
||||
.unwrap_or_default();
|
||||
matches!(
|
||||
chassis.as_str(),
|
||||
"8" | "9" | "10" | "11" | "14" | "30" | "31" | "32"
|
||||
) || fs::read_dir("/sys/class/power_supply").is_ok_and(|entries| {
|
||||
entries.flatten().any(|entry| {
|
||||
read_trim(&entry.path().join("type").to_string_lossy())
|
||||
.is_some_and(|kind| kind == "Battery")
|
||||
})
|
||||
})
|
||||
}
|
||||
fn memory_dmi() -> (String, String) {
|
||||
let text = match output("dmidecode", &["-t", "memory"]) {
|
||||
Some(s) => s,
|
||||
@@ -257,8 +271,8 @@ pub fn guided_tests(data: &Path) {
|
||||
println!("Invalid asset ID");
|
||||
return;
|
||||
}
|
||||
println!("\nNETWORK PRECHECK: Before Wi-Fi test, unplug Ethernet if one is connected.");
|
||||
if ethernet_connected() {
|
||||
println!("\nNETWORK PRECHECK");
|
||||
if mobile_device() && ethernet_connected() {
|
||||
println!("WARNING: Wired network link detected. Unplug LAN cable before Wi-Fi test.");
|
||||
let _ = ask("After unplugging LAN press Enter to recheck...");
|
||||
if ethernet_connected() {
|
||||
@@ -267,7 +281,7 @@ pub fn guided_tests(data: &Path) {
|
||||
} else {
|
||||
println!("No active wired link detected. Wireless testing may proceed.");
|
||||
}
|
||||
let wifi = if ethernet_connected() {
|
||||
let wifi = if mobile_device() && ethernet_connected() {
|
||||
"NOT_TESTED"
|
||||
} else {
|
||||
println!(
|
||||
|
||||
Reference in New Issue
Block a user