Skip to content

Commit eb3a76a

Browse files
committed
refactor: flatten v0 specs
1 parent 11371b0 commit eb3a76a

File tree

8 files changed

+335
-274
lines changed

8 files changed

+335
-274
lines changed

bin/propolis-server/src/lib/initializer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,9 +1009,9 @@ impl<'a> MachineInitializer<'a> {
10091009
info!(
10101010
self.log,
10111011
"Generating bootorder with order: {:?}",
1012-
self.spec.boot_order.as_ref()
1012+
self.spec.boot_settings.as_ref()
10131013
);
1014-
let Some(boot_names) = self.spec.boot_order.as_ref() else {
1014+
let Some(boot_names) = self.spec.boot_settings.as_ref() else {
10151015
return Ok(None);
10161016
};
10171017

@@ -1033,7 +1033,7 @@ impl<'a> MachineInitializer<'a> {
10331033
bdf
10341034
};
10351035

1036-
for boot_entry in boot_names.iter() {
1036+
for boot_entry in boot_names.order.iter() {
10371037
// Theoretically we could support booting from network devices by
10381038
// matching them here and adding their PCI paths, but exactly what
10391039
// would happen is ill-understood. So, only check disks here.

bin/propolis-server/src/lib/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fn instance_spec_from_request(
131131

132132
if let Some(boot_settings) = request.boot_settings.as_ref() {
133133
for item in boot_settings.order.iter() {
134-
spec_builder.add_boot_option(item)?;
134+
spec_builder.add_boot_option(item.clone())?;
135135
}
136136
}
137137

0 commit comments

Comments
 (0)