Skip to content

Commit 3d5bc64

Browse files
authored
bootspec: fix synthesis with new Nixpkgs (#204)
Nixpkgs changed the location of the kernel image in NixOS/nixpkgs#423933.
1 parent 5f2a0a8 commit 3d5bc64

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

bootspec/src/v1.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,7 @@ impl BootSpecV1 {
112112
err: e,
113113
})?;
114114

115-
let kernel_image_name = match system.as_str() {
116-
"x86_64-linux" => "bzImage",
117-
_ => "Image",
118-
};
119-
let kernel_file = generation.join(format!("kernel-modules/{}", kernel_image_name));
115+
let kernel_file = generation.join("kernel");
120116
let kernel =
121117
fs::canonicalize(kernel_file.clone()).map_err(|e| SynthesizeError::Canonicalize {
122118
path: kernel_file,
@@ -212,8 +208,7 @@ mod tests {
212208
fs::write(generation.join("nixos-version"), system_version)
213209
.expect("Failed to write to test generation");
214210
fs::write(generation.join("system"), system).expect("Failed to write system double");
215-
fs::write(generation.join("kernel-modules/bzImage"), "")
216-
.expect("Failed to write to test generation");
211+
fs::write(generation.join("kernel"), "").expect("Failed to write to test generation");
217212
fs::write(generation.join("kernel-params"), kernel_params.join(" "))
218213
.expect("Failed to write to test generation");
219214
fs::write(generation.join("init"), "").expect("Failed to write to test generation");
@@ -293,7 +288,7 @@ mod tests {
293288
BootSpecV1 {
294289
system,
295290
label: "NixOS test-version-1 (Linux 1.1.1-test1)".into(),
296-
kernel: generation.join("kernel-modules/bzImage"),
291+
kernel: generation.join("kernel"),
297292
kernel_params,
298293
init: generation.join("init"),
299294
initrd: Some(generation.join("initrd")),
@@ -362,7 +357,7 @@ mod tests {
362357
BootSpecV1 {
363358
system,
364359
label: "NixOS test-version-3 (Linux 1.1.1-test3)".into(),
365-
kernel: generation.join("kernel-modules/bzImage"),
360+
kernel: generation.join("kernel"),
366361
kernel_params,
367362
init: generation.join("init"),
368363
initrd: Some(generation.join("initrd")),

0 commit comments

Comments
 (0)