Skip to content

Commit 2c34df6

Browse files
Johan-Liebert1cgwalters
authored andcommitted
project: Fix typos
Fix a few typos across the project. Also update some comments/error messages Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
1 parent 815810d commit 2c34df6

File tree

16 files changed

+24
-24
lines changed

16 files changed

+24
-24
lines changed

GOVERNANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The Bootc and its leadership embrace the following values:
3737

3838
## Maintainers
3939

40-
Bootc Maintainers have "gated" write acess to the [project GitHub repository](https://github.com/bootc-dev/bootc).
40+
Bootc Maintainers have "gated" write access to the [project GitHub repository](https://github.com/bootc-dev/bootc).
4141
The current maintainers can be found in [MAINTAINERS.md](./MAINTAINERS.md).
4242

4343
Direct pushes to the code is never allowed. All pull requests require review by a maintainer

crates/etc-merge/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,14 +577,14 @@ fn create_dir_with_perms(
577577
if new_inode.is_none() {
578578
// Here we use `create_dir_all` to create every parent as we will set the permissions later
579579
// on. Due to the fact that we have an ordered (sorted) list of directories and directory
580-
// entries and we have a DFS traversal, we will aways have directory creation starting from
580+
// entries and we have a DFS traversal, we will always have directory creation starting from
581581
// the parent anyway.
582582
//
583583
// The exception being, if a directory is modified in the current_etc, and a new directory
584-
// is added inside the modified directory, say `dir/prems` has its premissions modified and
584+
// is added inside the modified directory, say `dir/prems` has its permissions modified and
585585
// `dir/prems/new` is the new directory created. Since we handle added files/directories first,
586586
// we will create the directories `perms/new` with directory `new` also getting its
587-
// permissions set, but `perms` will not. `perms` will have its premissions set up when we
587+
// permissions set, but `perms` will not. `perms` will have its permissions set up when we
588588
// handle the modified directories.
589589
new_etc_fd
590590
.create_dir_all(&dir_name)

crates/lib/src/bootc_composefs/boot.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,8 @@ pub(crate) fn setup_composefs_bls_boot(
675675
}
676676
}
677677

678-
let shared_entry = shared_entry.ok_or_else(|| {
679-
anyhow::anyhow!("Could not get symlink to BLS boot entry")
680-
})?;
678+
let shared_entry = shared_entry
679+
.ok_or_else(|| anyhow::anyhow!("Shared boot binaries not found"))?;
681680

682681
match bls_config.cfg_type {
683682
BLSConfigType::NonEFI {

crates/lib/src/bootc_composefs/delete.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fn delete_type1_entry(depl: &DeploymentEntry, boot_dir: &Dir, deleting_staged: b
5151
if !file_name.ends_with(".conf") {
5252
// We don't put any non .conf file in the entries dir
5353
// This is here just for sanity
54-
tracing::debug!("Found non .conf file '{file_name}' in entires dir");
54+
tracing::debug!("Found non .conf file '{file_name}' in entries dir");
5555
continue;
5656
}
5757

crates/lib/src/bootc_composefs/state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ pub(crate) fn composefs_usr_overlay() -> Result<()> {
239239
.context("Failed to get mount details for /usr")?;
240240

241241
let is_usr_mounted =
242-
is_usr_mounted.ok_or_else(|| anyhow::anyhow!("Falied to get mountinfo"))?;
242+
is_usr_mounted.ok_or_else(|| anyhow::anyhow!("Failed to get mountinfo"))?;
243243

244244
if is_usr_mounted {
245245
println!("A writeable overlayfs is already mounted on /usr");

crates/lib/src/bootc_composefs/switch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub(crate) async fn switch_composefs(
6464

6565
UpdateAction::UpdateOrigin => {
6666
// The staged image will never be the current image's verity digest
67-
println!("Image already in compoesfs repository");
67+
println!("Image already in composefs repository");
6868
println!("Updating target image reference");
6969
return update_target_imgref_in_origin(storage, booted_cfs, &target_imgref);
7070
}

crates/lib/src/bootc_composefs/update.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@ pub(crate) fn validate_update(
144144
// This could be someone trying to `bootc switch <remote_image>` where
145145
// remote_image is the exact same image as the one currently booted, but
146146
// they are wanting to change the target
147+
// We just update the image origin file here
147148
//
148-
// We could simply update the image origin file here
149+
// If it's not a switch op, then we skip the update
149150
if image_id.to_hex() == *booted_cfs.cmdline.digest {
150151
let ret = if is_switch {
151152
UpdateAction::UpdateOrigin

crates/lib/src/composefs_consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![allow(dead_code)]
22

3-
/// composefs= paramter in kernel cmdline
3+
/// composefs= parameter in kernel cmdline
44
pub const COMPOSEFS_CMDLINE: &str = "composefs";
55

66
/// Directory to store transient state, such as staged deployemnts etc

crates/lib/src/install.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ async fn install_with_sysroot(
15501550
}
15511551
tracing::debug!("Installed bootloader");
15521552

1553-
tracing::debug!("Perfoming post-deployment operations");
1553+
tracing::debug!("Performing post-deployment operations");
15541554

15551555
match bound_images {
15561556
BoundImages::Skip => {}
@@ -1951,7 +1951,7 @@ pub enum Cleanup {
19511951
TriggerOnNextBoot,
19521952
}
19531953

1954-
/// Implementation of the `bootc install to-filsystem` CLI command.
1954+
/// Implementation of the `bootc install to-filesystem` CLI command.
19551955
#[context("Installing to filesystem")]
19561956
pub(crate) async fn install_to_filesystem(
19571957
opts: InstallToFilesystemOpts,
@@ -2154,7 +2154,7 @@ pub(crate) async fn install_to_filesystem(
21542154

21552155
let rootarg = format!("root={}", root_info.mount_spec);
21562156
let mut boot = if let Some(spec) = fsopts.boot_mount_spec {
2157-
// An empty boot mount spec signals to ommit the mountspec kargs
2157+
// An empty boot mount spec signals to omit the mountspec kargs
21582158
// See https://github.com/bootc-dev/bootc/issues/1441
21592159
if spec.is_empty() {
21602160
None

crates/lib/src/parsers/grub_menuconfig.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ fn parse_menuentry(input: &str) -> IResult<&str, MenuEntry<'_>> {
186186
// Skip any whitespace after title
187187
let (input, _) = multispace0.parse(input)?;
188188

189-
// Eat up everything insde { .. }
189+
// Eat up everything inside { .. }
190190
let (input, body) = delimited(
191191
tag("{"),
192192
take_until_balanced_allow_nested('{', '}'),

0 commit comments

Comments
 (0)