Skip to content

uptime: add support for OpenBSD using utmp #6514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
sylvestre merged 2 commits into from
Jun 30, 2024
Merged

uptime: add support for OpenBSD using utmp #6514

sylvestre merged 2 commits into from
Jun 30, 2024

Conversation

@lcheylus
Copy link
Contributor

@lcheylus lcheylus commented Jun 30, 2024 •
edited
Loading

  • Add OpenBSD support for uptime using utmp-classic crate to parse UTMP file (/var/run/utmp by default): get uptime and count of logged users.
  • Enable tests for uptime (previously disabled on OpenBSD) and add a new specific test for OpenBSD (parse UTMP file, same as used for users test).

Fix #5664

Build and tests OK on OpenBSD current/amd64 and Linux Debian/testing with Rust 1.79.0

  • Unit tests:
$ cargo test -v --no-default-features --features uptime
  (...)
  test test_uptime::test_failed ... ok
  test test_uptime::test_invalid_arg ... ok
  test test_uptime::test_uptime ... ok
  test test_uptime::test_uptime_check_users_openbsd ... ok
  test test_uptime::test_uptime_with_dir ... ok
  test test_uptime::test_uptime_since ... ok
  test test_uptime::test_uptime_with_extra_argument ... ok
  test test_uptime::test_uptime_with_non_existent_file ... ok

  test result: ok. 34 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.19s
  • Test for uptime --since
$ target/debug/coreutils uptime -s
2024-06-29 08:57:30
  • Comparison with GNU uptime (binary = guptime on OpenBSD, installed via coreutils-9.5 package)
$ target/debug/coreutils uptime && guptime
 17:57:50  up 1 day,  9:00,  1 user,  load average: 0.07, 0.16, 0.14
 17:57:50  up 1 day,  9:00,  1 user,  load average: 0.07, 0.16, 0.14

lcheylus added 2 commits June 30, 2024 16:17
@lcheylus
uptime: add support for OpenBSD using utmp
920d29f 
OpenBSD uses the original utmp file format when the other OS use utmpx
format to get infos for boot time and logged users.

By using the `utmp-classic` crate, we can process the logged users
on system from the /var/run/utmp file.

Signed-off-by: Laurent Cheylus <[email protected]>
@lcheylus
tests: enable tests for uptime on OpenBSD
c0a3662 
Signed-off-by: Laurent Cheylus <[email protected]>
@sylvestre
Copy link
Contributor

sylvestre commented Jun 30, 2024

Thanks!

@sylvestre sylvestre merged commit 96fa8e9 into uutils:main Jun 30, 2024
@lcheylus lcheylus deleted the openbsd-uptime branch July 1, 2024 05:53
@BenWiederhake BenWiederhake mentioned this pull request Jul 15, 2024
Merged
@BrewTestBot BrewTestBot mentioned this pull request Nov 16, 2024
Merged
@moonfruit moonfruit mentioned this pull request Nov 22, 2024
Closed
@lcheylus lcheylus mentioned this pull request Mar 22, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

uptime: support on OpenBSD

2 participants

@lcheylus @sylvestre