fix(kernel): match the VDB record exactly and use loader/entries for BLS
Some checks are pending
ci / test (push) Waiting to run
Some checks are pending
ci / test (push) Waiting to run
This commit is contained in:
parent
531b9f0ea5
commit
f18505aee9
2 changed files with 47 additions and 10 deletions
|
|
@ -251,7 +251,16 @@ fn vdb_has_atom(root: &Path, atom: &str) -> bool {
|
||||||
};
|
};
|
||||||
entries.flatten().any(|e| {
|
entries.flatten().any(|e| {
|
||||||
let name = e.file_name().to_string_lossy().to_string();
|
let name = e.file_name().to_string_lossy().to_string();
|
||||||
name == package || name.starts_with(&format!("{package}-"))
|
if name == package {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
match name.strip_prefix(&format!("{package}-")) {
|
||||||
|
// A Gentoo version begins with a digit. Requiring it stops a
|
||||||
|
// sibling package (`gentoo-kernel-bin-…`) from matching the
|
||||||
|
// prefix `gentoo-kernel-…`.
|
||||||
|
Some(rest) => rest.chars().next().is_some_and(|c| c.is_ascii_digit()),
|
||||||
|
None => false,
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -198,7 +198,16 @@ fn vdb_has_atom(root: &Path, atom: &str) -> bool {
|
||||||
};
|
};
|
||||||
entries.flatten().any(|e| {
|
entries.flatten().any(|e| {
|
||||||
let name = e.file_name().to_string_lossy().to_string();
|
let name = e.file_name().to_string_lossy().to_string();
|
||||||
name == package || name.starts_with(&format!("{package}-"))
|
if name == package {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
match name.strip_prefix(&format!("{package}-")) {
|
||||||
|
// A Gentoo version begins with a digit. Requiring it stops a
|
||||||
|
// sibling package (`gentoo-kernel-bin-…`) from matching the
|
||||||
|
// prefix `gentoo-kernel-…`.
|
||||||
|
Some(rest) => rest.chars().next().is_some_and(|c| c.is_ascii_digit()),
|
||||||
|
None => false,
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -206,11 +215,13 @@ fn vdb_has_atom(root: &Path, atom: &str) -> bool {
|
||||||
/// tuned). Returns the new entry file name. Never rewrites the default loader
|
/// tuned). Returns the new entry file name. Never rewrites the default loader
|
||||||
/// selection.
|
/// selection.
|
||||||
fn source_kernel_bls_entry(root: &Path, choice: KernelChoice) -> Result<String> {
|
fn source_kernel_bls_entry(root: &Path, choice: KernelChoice) -> Result<String> {
|
||||||
let entries = root.join("efi/EFI/Linux");
|
// systemd-boot BLS entries live in `$ESP/loader/entries/*.conf` (the same
|
||||||
|
// directory `boot.rs` writes). `EFI/Linux` is for UKIs, which are deferred.
|
||||||
|
let entries = root.join("efi/loader/entries");
|
||||||
let entries = if entries.is_dir() {
|
let entries = if entries.is_dir() {
|
||||||
entries
|
entries
|
||||||
} else {
|
} else {
|
||||||
root.join("boot/EFI/Linux")
|
root.join("boot/loader/entries")
|
||||||
};
|
};
|
||||||
let Ok(dir) = std::fs::read_dir(&entries) else {
|
let Ok(dir) = std::fs::read_dir(&entries) else {
|
||||||
return Err(ExecError::operation(
|
return Err(ExecError::operation(
|
||||||
|
|
@ -356,9 +367,9 @@ mod tests {
|
||||||
std::fs::create_dir_all(root.join(dir)).unwrap();
|
std::fs::create_dir_all(root.join(dir)).unwrap();
|
||||||
}
|
}
|
||||||
// Fixture boot layout: one default entry plus the loader config.
|
// Fixture boot layout: one default entry plus the loader config.
|
||||||
std::fs::create_dir_all(root.join("efi/EFI/Linux")).unwrap();
|
std::fs::create_dir_all(root.join("efi/loader/entries")).unwrap();
|
||||||
std::fs::write(
|
std::fs::write(
|
||||||
root.join("efi/EFI/Linux/phoebus.conf"),
|
root.join("efi/loader/entries/phoebus.conf"),
|
||||||
"title Phoebus\nlinux /vmlinuz-6.12.32\noptions root=/dev/mapper/cryptroot\n",
|
"title Phoebus\nlinux /vmlinuz-6.12.32\noptions root=/dev/mapper/cryptroot\n",
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
@ -372,7 +383,8 @@ mod tests {
|
||||||
let out = build_tuned_kernel(&exec, root, true).unwrap();
|
let out = build_tuned_kernel(&exec, root, true).unwrap();
|
||||||
assert!(out.contains("separate boot entry"), "{out}");
|
assert!(out.contains("separate boot entry"), "{out}");
|
||||||
// The new entry exists and derives from the current one.
|
// The new entry exists and derives from the current one.
|
||||||
let tuned = std::fs::read_to_string(root.join("efi/EFI/Linux/phoebus-tuned.conf")).unwrap();
|
let tuned =
|
||||||
|
std::fs::read_to_string(root.join("efi/loader/entries/phoebus-tuned.conf")).unwrap();
|
||||||
assert!(tuned.contains("linux /vmlinuz-6.12.32"), "{tuned}");
|
assert!(tuned.contains("linux /vmlinuz-6.12.32"), "{tuned}");
|
||||||
// The default was NOT switched: no test boot happened in this
|
// The default was NOT switched: no test boot happened in this
|
||||||
// context, so the generic kernel stays the default.
|
// context, so the generic kernel stays the default.
|
||||||
|
|
@ -390,6 +402,22 @@ mod tests {
|
||||||
assert_only_generic_kernel(&["sys-kernel/gentoo-kernel-bin".to_string()]);
|
assert_only_generic_kernel(&["sys-kernel/gentoo-kernel-bin".to_string()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn vdb_match_does_not_confuse_sibling_packages() {
|
||||||
|
let runner = RecordingRunner::new();
|
||||||
|
let exec = make_exec(runner);
|
||||||
|
let root = Path::new(&exec.root);
|
||||||
|
std::fs::create_dir_all(root.join("var/db/pkg/sys-kernel/gentoo-kernel-bin-6.18.50"))
|
||||||
|
.unwrap();
|
||||||
|
assert!(vdb_has_atom(root, "sys-kernel/gentoo-kernel-bin"));
|
||||||
|
assert!(
|
||||||
|
!vdb_has_atom(root, "sys-kernel/gentoo-kernel"),
|
||||||
|
"gentoo-kernel-bin must not satisfy the gentoo-kernel atom"
|
||||||
|
);
|
||||||
|
std::fs::create_dir_all(root.join("var/db/pkg/sys-kernel/gentoo-kernel-6.18.50")).unwrap();
|
||||||
|
assert!(vdb_has_atom(root, "sys-kernel/gentoo-kernel"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn balanced_build_refuses_without_the_known_good_fallback() {
|
fn balanced_build_refuses_without_the_known_good_fallback() {
|
||||||
let runner = RecordingRunner::new();
|
let runner = RecordingRunner::new();
|
||||||
|
|
@ -410,9 +438,9 @@ mod tests {
|
||||||
] {
|
] {
|
||||||
std::fs::create_dir_all(root.join(dir)).unwrap();
|
std::fs::create_dir_all(root.join(dir)).unwrap();
|
||||||
}
|
}
|
||||||
std::fs::create_dir_all(root.join("efi/EFI/Linux")).unwrap();
|
std::fs::create_dir_all(root.join("efi/loader/entries")).unwrap();
|
||||||
std::fs::write(
|
std::fs::write(
|
||||||
root.join("efi/EFI/Linux/phoebus.conf"),
|
root.join("efi/loader/entries/phoebus.conf"),
|
||||||
"title Phoebus\nlinux /vmlinuz-6.12.32\noptions root=/dev/mapper/cryptroot\n",
|
"title Phoebus\nlinux /vmlinuz-6.12.32\noptions root=/dev/mapper/cryptroot\n",
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
@ -426,7 +454,7 @@ mod tests {
|
||||||
let out = build_balanced_kernel(&exec, root, false).unwrap();
|
let out = build_balanced_kernel(&exec, root, false).unwrap();
|
||||||
assert!(out.contains("balanced source kernel"), "{out}");
|
assert!(out.contains("balanced source kernel"), "{out}");
|
||||||
let entry =
|
let entry =
|
||||||
std::fs::read_to_string(root.join("efi/EFI/Linux/phoebus-balanced.conf")).unwrap();
|
std::fs::read_to_string(root.join("efi/loader/entries/phoebus-balanced.conf")).unwrap();
|
||||||
assert!(entry.contains("linux /vmlinuz-6.12.32"), "{entry}");
|
assert!(entry.contains("linux /vmlinuz-6.12.32"), "{entry}");
|
||||||
assert!(entry.contains("balanced"), "{entry}");
|
assert!(entry.contains("balanced"), "{entry}");
|
||||||
// The balanced fragment carries broad hot-plug coverage, not tuning.
|
// The balanced fragment carries broad hot-plug coverage, not tuning.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue