containers/bootc
1
0
Fork 0
mirror of https://github.com/containers/bootc.git synced 2026-02-05 15:45:53 +01:00
Code Issues Activity

project: Fix typos

Browse Source 
Fix a few typos across the project. Also update some comments/error
messages

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
This commit is contained in:
Pragyan Poudyal
2025-11-26 15:32:27 +05:30
committed by Colin Walters
parent 815810d7ab
commit 2c34df6860
16 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GOVERNANCE.md
View File

@@ -37,7 +37,7 @@ The Bootc and its leadership embrace the following values:
## Maintainers
Bootc Maintainers have "gated" write acess to the [project GitHub repository](https://github.com/bootc-dev/bootc).
Bootc Maintainers have "gated" write access to the [project GitHub repository](https://github.com/bootc-dev/bootc).
The current maintainers can be found in [MAINTAINERS.md](./MAINTAINERS.md).
Direct pushes to the code is never allowed. All pull requests require review by a maintainer

6
crates/etc-merge/src/lib.rs
View File

@@ -577,14 +577,14 @@ fn create_dir_with_perms(
if new_inode.is_none() {
// Here we use `create_dir_all` to create every parent as we will set the permissions later
// on. Due to the fact that we have an ordered (sorted) list of directories and directory
// entries and we have a DFS traversal, we will aways have directory creation starting from
// entries and we have a DFS traversal, we will always have directory creation starting from
// the parent anyway.
//
// The exception being, if a directory is modified in the current_etc, and a new directory
// is added inside the modified directory, say `dir/prems` has its premissions modified and
// is added inside the modified directory, say `dir/prems` has its permissions modified and
// `dir/prems/new` is the new directory created. Since we handle added files/directories first,
// we will create the directories `perms/new` with directory `new` also getting its
// permissions set, but `perms` will not. `perms` will have its premissions set up when we
// permissions set, but `perms` will not. `perms` will have its permissions set up when we
// handle the modified directories.
new_etc_fd
.create_dir_all(&dir_name)

5
crates/lib/src/bootc_composefs/boot.rs
View File

@@ -675,9 +675,8 @@ pub(crate) fn setup_composefs_bls_boot(
}
}
let shared_entry = shared_entry.ok_or_else(|| {
anyhow::anyhow!("Could not get symlink to BLS boot entry")
})?;
let shared_entry = shared_entry
.ok_or_else(|| anyhow::anyhow!("Shared boot binaries not found"))?;
match bls_config.cfg_type {
BLSConfigType::NonEFI {

2
crates/lib/src/bootc_composefs/delete.rs
View File

@@ -51,7 +51,7 @@ fn delete_type1_entry(depl: &DeploymentEntry, boot_dir: &Dir, deleting_staged: b
if !file_name.ends_with(".conf") {
// We don't put any non .conf file in the entries dir
// This is here just for sanity
tracing::debug!("Found non .conf file '{file_name}' in entires dir");
tracing::debug!("Found non .conf file '{file_name}' in entries dir");
continue;
}

2
crates/lib/src/bootc_composefs/state.rs
View File

@@ -239,7 +239,7 @@ pub(crate) fn composefs_usr_overlay() -> Result<()> {
.context("Failed to get mount details for /usr")?;
let is_usr_mounted =
is_usr_mounted.ok_or_else(|| anyhow::anyhow!("Falied to get mountinfo"))?;
is_usr_mounted.ok_or_else(|| anyhow::anyhow!("Failed to get mountinfo"))?;
if is_usr_mounted {
println!("A writeable overlayfs is already mounted on /usr");

2
crates/lib/src/bootc_composefs/switch.rs
View File

@@ -64,7 +64,7 @@ pub(crate) async fn switch_composefs(
UpdateAction::UpdateOrigin => {
// The staged image will never be the current image's verity digest
println!("Image already in compoesfs repository");
println!("Image already in composefs repository");
println!("Updating target image reference");
return update_target_imgref_in_origin(storage, booted_cfs, &target_imgref);
}

3
crates/lib/src/bootc_composefs/update.rs
View File

@@ -144,8 +144,9 @@ pub(crate) fn validate_update(
// This could be someone trying to `bootc switch <remote_image>` where
// remote_image is the exact same image as the one currently booted, but
// they are wanting to change the target
// We just update the image origin file here
//
// We could simply update the image origin file here
// If it's not a switch op, then we skip the update
if image_id.to_hex() == *booted_cfs.cmdline.digest {
let ret = if is_switch {
UpdateAction::UpdateOrigin

2
crates/lib/src/composefs_consts.rs
View File

@@ -1,6 +1,6 @@
#![allow(dead_code)]
/// composefs= paramter in kernel cmdline
/// composefs= parameter in kernel cmdline
pub const COMPOSEFS_CMDLINE: &str = "composefs";
/// Directory to store transient state, such as staged deployemnts etc

6
crates/lib/src/install.rs
View File

@@ -1550,7 +1550,7 @@ async fn install_with_sysroot(
}
tracing::debug!("Installed bootloader");
tracing::debug!("Perfoming post-deployment operations");
tracing::debug!("Performing post-deployment operations");
match bound_images {
BoundImages::Skip => {}
@@ -1951,7 +1951,7 @@ pub enum Cleanup {
TriggerOnNextBoot,
}
/// Implementation of the `bootc install to-filsystem` CLI command.
/// Implementation of the `bootc install to-filesystem` CLI command.
#[context("Installing to filesystem")]
pub(crate) async fn install_to_filesystem(
opts: InstallToFilesystemOpts,
@@ -2154,7 +2154,7 @@ pub(crate) async fn install_to_filesystem(
let rootarg = format!("root={}", root_info.mount_spec);
let mut boot = if let Some(spec) = fsopts.boot_mount_spec {
// An empty boot mount spec signals to ommit the mountspec kargs
// An empty boot mount spec signals to omit the mountspec kargs
// See https://github.com/bootc-dev/bootc/issues/1441
if spec.is_empty() {
None

2
crates/lib/src/parsers/grub_menuconfig.rs
View File

@@ -186,7 +186,7 @@ fn parse_menuentry(input: &str) -> IResult<&str, MenuEntry<'_>> {
// Skip any whitespace after title
let (input, _) = multispace0.parse(input)?;
// Eat up everything insde { .. }
// Eat up everything inside { .. }
let (input, body) = delimited(
tag("{"),
take_until_balanced_allow_nested('{', '}'),

2
crates/lib/src/spec.rs
View File

@@ -167,7 +167,7 @@ pub struct BootEntryOstree {
clap::ValueEnum, Debug, Default, Clone, Serialize, Deserialize, PartialEq, Eq, JsonSchema,
)]
pub enum Bootloader {
/// Use Grub as the booloader
/// Use Grub as the bootloader
#[default]
Grub,
/// Use SystemdBoot as the bootloader

2
crates/lib/src/store/mod.rs
View File

@@ -269,7 +269,7 @@ pub(crate) struct Storage {
ostree: OnceCell<SysrootLock>,
/// The composefs storage
composefs: OnceCell<Arc<ComposefsRepository>>,
/// The containers-image storage used foR LBIs
/// The containers-image storage used for LBIs
imgstore: OnceCell<CStorage>,
}

2
crates/ostree-ext/src/chunking.rs
View File

@@ -932,7 +932,7 @@ mod test {
#[test]
fn test_advanced_packing() -> Result<()> {
// Step1 : Initial build (Packing sructure computed)
// Step1 : Initial build (Packing structure computed)
let contentmeta_v0: Vec<ObjectSourceMetaSized> = vec![
vec![1, u32::MAX, 100000],
vec![2, u32::MAX, 99999],

6
crates/ostree-ext/src/cli.rs
View File

@@ -36,17 +36,17 @@ use crate::sysroot::SysrootLock;
use ostree_container::store::{ImageImporter, PrepareResult};
use serde::{Deserialize, Serialize};
/// Parse an [`OstreeImageReference`] from a CLI arguemnt.
/// Parse an [`OstreeImageReference`] from a CLI argument.
pub fn parse_imgref(s: &str) -> Result<OstreeImageReference> {
OstreeImageReference::try_from(s)
}
/// Parse a base [`ImageReference`] from a CLI arguemnt.
/// Parse a base [`ImageReference`] from a CLI argument.
pub fn parse_base_imgref(s: &str) -> Result<ImageReference> {
ImageReference::try_from(s)
}
/// Parse an [`ostree::Repo`] from a CLI arguemnt.
/// Parse an [`ostree::Repo`] from a CLI argument.
pub fn parse_repo(s: &Utf8Path) -> Result<ostree::Repo> {
let repofd = cap_std::fs::Dir::open_ambient_dir(s, cap_std::ambient_authority())
.with_context(|| format!("Opening directory at '{s}'"))?;

2
crates/ostree-ext/src/tar/export.rs
View File

@@ -494,7 +494,7 @@ impl<'a, W: std::io::Write> OstreeTarWriter<'a, W> {
} else {
false
};
// Link sizes shoud always be zero
// Link sizes should always be zero
h.set_size(0);
if is_regular_zerosized {
self.out.append_data(&mut h, dest, &mut std::io::empty())?;

2
tmt/tests/booted/test-logically-bound-switch.nu
View File

@@ -9,7 +9,7 @@
# <reboot>
# <verify booted state>
# bootc upgrade
# <verify new boudn images are pulled>
# <verify new bound images are pulled>
# <reboot>
# <verify booted state>