brl/citadel-tools
1
0
Fork 2
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

set PREFER_BOOT flag by default when installing a rootfs partition

Browse Source
This commit is contained in:
Bruce Leidl 2019-01-17 09:11:18 -05:00
parent d244c07483
commit 29f487a16e
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
citadel-image/src/main.rs
View File

@ -13,7 +13,7 @@ use clap::AppSettings::*;
use build::UpdateBuilder; use build::UpdateBuilder;
use config::BuildConfig; use config::BuildConfig;
use libcitadel::{Result,ResourceImage,set_verbose,format_error,Partition,KeyPair}; use libcitadel::{Result,ResourceImage,set_verbose,format_error,Partition,KeyPair,ImageHeader};
mod build; mod build;
mod config; mod config;
@ -52,6 +52,9 @@ fn main() {
.arg(Arg::with_name("skip-sha") .arg(Arg::with_name("skip-sha")
.long("skip-sha") .long("skip-sha")
.help("Skip verification of header sha256 value")) .help("Skip verification of header sha256 value"))
.arg(Arg::with_name("no-prefer")
.long("no-prefer")
.help("Don't set PREFER_BOOT flag"))
.arg(Arg::with_name("path") .arg(Arg::with_name("path")
.required_unless("choose") .required_unless("choose")
.help("Path to image file"))) .help("Path to image file")))
@ -161,9 +164,6 @@ fn install_rootfs(arg_matches: &ArgMatches) -> Result<()> {
let img = load_image(arg_matches)?; let img = load_image(arg_matches)?;
info!("Verifying header signature");
img.header().verify_signature()?;
if !arg_matches.is_present("skip-sha") { if !arg_matches.is_present("skip-sha") {
info!("Verifying sha256 hash of image"); info!("Verifying sha256 hash of image");
let shasum = img.generate_shasum()?; let shasum = img.generate_shasum()?;
@ -173,10 +173,24 @@ fn install_rootfs(arg_matches: &ArgMatches) -> Result<()> {
} }
let partition = choose_install_partition(true)?; let partition = choose_install_partition(true)?;
if !arg_matches.is_present("no-prefer") {
clear_prefer_boot()?;
img.header().set_flag(ImageHeader::FLAG_PREFER_BOOT);
}
img.write_to_partition(&partition)?; img.write_to_partition(&partition)?;
Ok(()) Ok(())
} }
fn clear_prefer_boot() -> Result<()> {
for mut p in Partition::rootfs_partitions()? {
if p.is_initialized() && p.header().has_flag(ImageHeader::FLAG_PREFER_BOOT) {
p.clear_flag_and_write(ImageHeader::FLAG_PREFER_BOOT)?;
}
}
Ok(())
}
fn sign_image(arg_matches: &ArgMatches) -> Result<()> { fn sign_image(arg_matches: &ArgMatches) -> Result<()> {
let _img = load_image(arg_matches)?; let _img = load_image(arg_matches)?;
info!("Not implemented yet"); info!("Not implemented yet");