admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Allow for -beta OR -current detection and use the correct system upgrade command for the OpenBSD step (#1066)

Browse Source 
* FIX: Allow for -beta OR -current detection and use the correct system upgrade command for the OpenBSD step

* FIX: Run fmt, clippy, and test
This commit is contained in:
Izzy Meyer
2025-03-12 20:02:45 -05:00
committed by GitHub
parent 722903fec3
commit 5770a5caa7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/steps/os/openbsd.rs
View File

@@ -8,7 +8,7 @@ use std::fs;
fn is_openbsd_current(ctx: &ExecutionContext) -> Result<bool> { fn is_openbsd_current(ctx: &ExecutionContext) -> Result<bool> {
let motd_content = fs::read_to_string("/etc/motd")?; let motd_content = fs::read_to_string("/etc/motd")?;
let is_current = motd_content.contains("-current"); let is_current = ["-current", "-beta"].iter().any(|&s| motd_content.contains(s));
if ctx.config().dry_run() { if ctx.config().dry_run() {
println!("{}", t!("Would check if OpenBSD is -current")); println!("{}", t!("Would check if OpenBSD is -current"));
Ok(is_current) Ok(is_current)
@@ -28,10 +28,11 @@ pub fn upgrade_openbsd(ctx: &ExecutionContext) -> Result<()> {
return Ok(()); return Ok(());
} }
let mut args = vec!["/usr/sbin/sysupgrade", "-n"]; let args = if is_current {
if is_current { vec!["/usr/sbin/sysupgrade", "-sn"]
args.push("-s"); } else {
} vec!["/usr/sbin/syspatch"]
};
ctx.run_type().execute(sudo).args(&args).status_checked() ctx.run_type().execute(sudo).args(&args).status_checked()
} }