Skip to content

Commit 1cbfdc8

Browse files
committed
Rename kernel.rs -> kernel_cmdline.rs
To clarify what this does more. Signed-off-by: Colin Walters <[email protected]>
1 parent 18f890f commit 1cbfdc8

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

crates/lib/src/install.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ use self::baseline::InstallBlockDeviceOpts;
5555
use crate::boundimage::{BoundImage, ResolvedBoundImage};
5656
use crate::containerenv::ContainerExecutionInfo;
5757
use crate::deploy::{prepare_for_pull, pull_from_prepared, PreparedImportMeta, PreparedPullResult};
58-
use crate::kernel::Cmdline;
58+
use crate::kernel_cmdline::Cmdline;
5959
use crate::lsm;
6060
use crate::progress_jsonl::ProgressWriter;
6161
use crate::spec::ImageReference;
@@ -1668,10 +1668,11 @@ fn find_root_args_to_inherit(cmdline: &Cmdline, root_info: &Filesystem) -> Resul
16681668
.context("Parsing root= karg")?;
16691669
// If we have a root= karg, then use that
16701670
let (mount_spec, kargs) = if let Some(root) = root {
1671-
let rootflags = cmdline.find(crate::kernel::ROOTFLAGS);
1672-
let inherit_kargs = cmdline
1673-
.iter()
1674-
.filter(|arg| arg.key.starts_with(crate::kernel::INITRD_ARG_PREFIX));
1671+
let rootflags = cmdline.find(crate::kernel_cmdline::ROOTFLAGS);
1672+
let inherit_kargs = cmdline.iter().filter(|arg| {
1673+
arg.key
1674+
.starts_with(crate::kernel_cmdline::INITRD_ARG_PREFIX)
1675+
});
16751676
(
16761677
root.to_owned(),
16771678
rootflags
File renamed without changes.

crates/lib/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mod docgen;
3434
mod bootloader;
3535
mod containerenv;
3636
mod install;
37-
mod kernel;
37+
mod kernel_cmdline;
3838

3939
#[cfg(feature = "grub")]
4040
pub(crate) mod parsers;

0 commit comments

Comments
 (0)