Skip to content

Commit e6ae8ae

Browse files
committed
Fix CI lint and smoke image config
1 parent ca0a049 commit e6ae8ae

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

crates/m80-firecracker/src/config.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,16 @@ pub fn load_from_paths(
142142

143143
// Layer 7: caller-supplied flag overrides.
144144
for (k, v) in args_overrides {
145-
if fields.contains_key(&k) {
146-
fields.insert(k, (v, ConfigSource::Flag));
147-
} else {
148-
return Err(FcError::Config(format!("unknown config override {k:?}")));
145+
match fields.entry(k) {
146+
std::collections::hash_map::Entry::Occupied(mut entry) => {
147+
entry.insert((v, ConfigSource::Flag));
148+
}
149+
std::collections::hash_map::Entry::Vacant(entry) => {
150+
return Err(FcError::Config(format!(
151+
"unknown config override {:?}",
152+
entry.key()
153+
)));
154+
}
149155
}
150156
}
151157

scripts/smoke.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ if [[ "$mode" == "full" ]]; then
129129
guestd_bin="$(pwd)/target/release/m80-guestd"
130130
cat > /tmp/m80-image-build.toml <<EOF
131131
[kernel]
132-
version = "v1.15"
132+
version = "$FIRECRACKER_VERSION"
133+
artifact_track = "v1.15"
133134
arch = "x86_64"
134135
135136
[rootfs]
@@ -154,7 +155,8 @@ EOF
154155
fi
155156
cat > /tmp/m80-image-build.toml <<EOF
156157
[kernel]
157-
version = "v1.15"
158+
version = "$FIRECRACKER_VERSION"
159+
artifact_track = "v1.15"
158160
arch = "x86_64"
159161
160162
[rootfs]

0 commit comments

Comments
 (0)