Rename grub feature to composefs-backend

This should make it easier to incrementally merge changes
here to main.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

crates/lib/Cargo.toml

@@ -70,13 +70,13 @@ similar-asserts = { workspace = true }
 static_assertions = { workspace = true }
 
 [features]
-default = ["install-to-disk", "grub"]
+default = ["install-to-disk"]
 # This feature enables `bootc install to-disk`, which is considered just a "demo"
 # or reference installer; we expect most nontrivial use cases to be using
 # `bootc install to-filesystem`.
 install-to-disk = []
-# Enable direct support for the GRUB bootloader
-grub = []
+# Enable support for the composefs native backend
+composefs-backend = []
 # This featuares enables `bootc internals publish-rhsm-facts` to integrate with
 # Red Hat Subscription Manager
 rhsm = []

crates/lib/src/lib.rs

@@ -36,7 +36,8 @@ mod containerenv;
 mod install;
 mod kernel_cmdline;
 
-#[cfg(feature = "grub")]
+#[cfg(feature = "composefs-backend")]
+#[allow(dead_code)]
 pub(crate) mod parsers;
 #[cfg(feature = "rhsm")]
 mod rhsm;

crates/lib/src/parsers/grub_menuconfig.rs

@@ -71,7 +71,6 @@ impl<'a> From<Vec<(&'a str, &'a str)>> for MenuentryBody<'a> {
 
 /// A complete GRUB menuentry with title and body commands.
 #[derive(Debug, PartialEq, Eq)]
-#[allow(dead_code)]
 pub(crate) struct MenuEntry<'a> {
     /// Display title (supports escaped quotes)
     pub(crate) title: &'a str,
@@ -88,8 +87,7 @@ impl<'a> Display for MenuEntry<'a> {
 }
 
 /// Parser that takes content until balanced brackets, handling nested brackets and escapes.
-#[allow(dead_code)]
-pub fn take_until_balanced_allow_nested(
+fn take_until_balanced_allow_nested(
     opening_bracket: char,
     closing_bracket: char,
 ) -> impl Fn(&str) -> IResult<&str, &str> {
@@ -141,7 +139,6 @@ pub fn take_until_balanced_allow_nested(
 }
 
 /// Parses a single menuentry with title and body commands.
-#[allow(dead_code)]
 fn parse_menuentry(input: &str) -> IResult<&str, MenuEntry<'_>> {
     let (input, _) = tag("menuentry").parse(input)?;
 
@@ -190,14 +187,12 @@ fn parse_menuentry(input: &str) -> IResult<&str, MenuEntry<'_>> {
 }
 
 /// Skips content until finding "menuentry" keyword or end of input.
-#[allow(dead_code)]
 fn skip_to_menuentry(input: &str) -> IResult<&str, ()> {
     let (input, _) = take_until("menuentry")(input)?;
     Ok((input, ()))
 }
 
 /// Parses all menuentries from a GRUB configuration file.
-#[allow(dead_code)]
 fn parse_all(input: &str) -> IResult<&str, Vec<MenuEntry<'_>>> {
     let mut remaining = input;
     let mut entries = Vec::new();
@@ -229,7 +224,6 @@ fn parse_all(input: &str) -> IResult<&str, Vec<MenuEntry<'_>>> {
 }
 
 /// Main entry point for parsing GRUB menuentry files.
-#[allow(dead_code)]
 pub(crate) fn parse_grub_menuentry_file(contents: &str) -> anyhow::Result<Vec<MenuEntry<'_>>> {
     let (_, entries) = parse_all(&contents)
         .map_err(|e| anyhow::anyhow!("Failed to parse GRUB menuentries: {e}"))?;