Move rpi-update under config.should_run(Step::Firmware) (#270)

Fixes #269.
This commit is contained in:
Kyle Copperfield
2019-12-01 06:40:50 +00:00
committed by Roey Darwish Dror
parent ccc09a6ee9
commit d577d76528

View File

@@ -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) {