Move rpi-update under config.should_run(Step::Firmware) (#270)
Fixes #269.
This commit is contained in:
committed by
Roey Darwish Dror
parent
ccc09a6ee9
commit
d577d76528
12
src/main.rs
12
src/main.rs
@@ -543,12 +543,6 @@ fn run() -> Result<(), Error> {
|
||||
|| linux::run_pihole_update(sudo.as_ref(), run_type),
|
||||
config.no_retry(),
|
||||
)?;
|
||||
execute(
|
||||
&mut report,
|
||||
"rpi-update",
|
||||
|| linux::run_rpi_update(sudo.as_ref(), run_type),
|
||||
config.no_retry(),
|
||||
)?;
|
||||
}
|
||||
|
||||
if config.should_run(Step::Firmware) {
|
||||
@@ -558,6 +552,12 @@ fn run() -> Result<(), Error> {
|
||||
|| linux::run_fwupdmgr(run_type),
|
||||
config.no_retry(),
|
||||
)?;
|
||||
execute(
|
||||
&mut report,
|
||||
"rpi-update",
|
||||
|| linux::run_rpi_update(sudo.as_ref(), run_type),
|
||||
config.no_retry(),
|
||||
)?;
|
||||
}
|
||||
|
||||
if config.should_run(Step::Restarts) {
|
||||
|
||||
Reference in New Issue
Block a user