Skip to content

Commit 220f404

Browse files
jeckersbcgwalters
authored andcommitted
Replace local bootc-kernel-cmdline crate with linux-kernel-cmdline
The kernel command line parsing crate has been split out into a separate repository and published to crates.io as linux-kernel-cmdline. Replace the local copy with the published version 0.1.1. The two bootc-specific constants (INITRD_ARG_PREFIX and ROOTFLAGS) that were defined in the local crate's lib.rs are not part of the published crate. These already had local definitions in bootc_kargs.rs, so update install.rs to use those instead. Signed-off-by: John Eckersberg <jeckersb@redhat.com>
1 parent ffc47fd commit 220f404

24 files changed

Lines changed: 35 additions & 2166 deletions

File tree

Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ tracing = "0.1.40"
7575
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
7676
tracing-journald = "0.3.1"
7777
uzers = "0.12"
78+
linux-kernel-cmdline = { version = "0.1.1", features = ["serde"] }
7879
xshell = "0.2.6"
7980

8081
# See https://github.com/coreos/cargo-vendor-filterer

crates/initramfs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ composefs-ctl.workspace = true
1616
toml.workspace = true
1717
tracing.workspace = true
1818
fn-error-context.workspace = true
19-
bootc-kernel-cmdline = { path = "../kernel_cmdline", version = "0.0.0" }
19+
linux-kernel-cmdline = { workspace = true }
2020

2121
[lints]
2222
workspace = true

crates/initramfs/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use composefs_ctl::composefs_boot;
3434

3535
use fn_error_context::context;
3636

37-
use bootc_kernel_cmdline::utf8::Cmdline;
37+
use linux_kernel_cmdline::utf8::Cmdline;
3838

3939
// mount_setattr syscall support
4040
const MOUNT_ATTR_RDONLY: u64 = 0x00000001;

crates/kernel_cmdline/Cargo.toml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)