Skip to content

Commit 5bd5aac

Browse files
Remove root= cmdline for sdboot
Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
1 parent c1474ce commit 5bd5aac

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

  • crates/lib/src/bootc_composefs

crates/lib/src/bootc_composefs/boot.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ use std::path::Path;
6868

6969
use anyhow::{Context, Result, anyhow, bail};
7070
use bootc_blockdev::find_parent_devices;
71-
use bootc_kernel_cmdline::utf8::{Cmdline, Parameter};
71+
use bootc_kernel_cmdline::utf8::{Cmdline, Parameter, ParameterKey};
7272
use bootc_mount::inspect_filesystem_of_dir;
7373
use bootc_mount::tempmount::TempMount;
7474
use camino::{Utf8Path, Utf8PathBuf};
@@ -566,6 +566,12 @@ pub(crate) fn setup_composefs_bls_boot(
566566
}
567567
};
568568

569+
// Remove "root=" from kernel cmdline as systemd-auto-gpt-generator should use DPS
570+
// UUID
571+
if bootloader == Bootloader::Systemd {
572+
cmdline_refs.remove(&ParameterKey::from("root"));
573+
}
574+
569575
let is_upgrade = matches!(setup_type, BootSetupType::Upgrade(..));
570576

571577
let current_root = if is_upgrade {

0 commit comments

Comments
 (0)