Skip to content

Commit eb717ab

Browse files
authored
Merge pull request #1512 from cgwalters/drop-grub-feature
Map grub feature to composefs-backend and import parser/bls
2 parents e99f5cc + 7018168 commit eb717ab

File tree

6 files changed

+447
-11
lines changed

6 files changed

+447
-11
lines changed

Cargo.lock

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

crates/lib/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,20 @@ serde_ignored = "0.1.10"
6464
serde_yaml = "0.9.34"
6565
tini = "1.3.0"
6666
uuid = { version = "1.8.0", features = ["v4"] }
67+
uapi-version = "0.4.0"
6768

6869
[dev-dependencies]
6970
similar-asserts = { workspace = true }
7071
static_assertions = { workspace = true }
7172

7273
[features]
73-
default = ["install-to-disk", "grub"]
74+
default = ["install-to-disk"]
7475
# This feature enables `bootc install to-disk`, which is considered just a "demo"
7576
# or reference installer; we expect most nontrivial use cases to be using
7677
# `bootc install to-filesystem`.
7778
install-to-disk = []
78-
# Enable direct support for the GRUB bootloader
79-
grub = []
79+
# Enable support for the composefs native backend
80+
composefs-backend = []
8081
# This featuares enables `bootc internals publish-rhsm-facts` to integrate with
8182
# Red Hat Subscription Manager
8283
rhsm = []

crates/lib/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ mod containerenv;
3636
mod install;
3737
mod kernel_cmdline;
3838

39-
#[cfg(feature = "grub")]
39+
#[cfg(feature = "composefs-backend")]
40+
#[allow(dead_code)]
4041
pub(crate) mod parsers;
4142
#[cfg(feature = "rhsm")]
4243
mod rhsm;

0 commit comments

Comments
 (0)