From 708a47471448c1c3fce4d5f933ae037bc38b97b4 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Tue, 31 Dec 2024 09:07:41 +0100 Subject: [PATCH] Fix NetBSD support. uname(1) on NetBSD doesn't support '-o', use '-s' instead. Add missing argument in a test while here. --- os_info/src/netbsd/mod.rs | 2 +- os_info/src/uname.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os_info/src/netbsd/mod.rs b/os_info/src/netbsd/mod.rs index 6f4651b..586a6aa 100644 --- a/os_info/src/netbsd/mod.rs +++ b/os_info/src/netbsd/mod.rs @@ -7,7 +7,7 @@ use crate::{architecture, bitness, uname::uname, Info, Type, Version}; pub fn current_platform() -> Info { trace!("netbsd::current_platform is called"); - let version = uname("-o") + let version = uname("-s") .map(Version::from_string) .unwrap_or_else(|| Version::Unknown); diff --git a/os_info/src/uname.rs b/os_info/src/uname.rs index 242c8ad..88a6ed9 100644 --- a/os_info/src/uname.rs +++ b/os_info/src/uname.rs @@ -26,7 +26,7 @@ mod tests { #[test] fn uname_nonempty() { - let val = uname().expect("uname failed"); + let val = uname("-s").expect("uname failed"); assert!(!val.is_empty()); } }