Skip to content

Commit 86ba489

Browse files
jeckersbcgwalters
authored andcommitted
Remove enforcing=0 for sealed composefs
Signed-off-by: John Eckersberg <jeckersb@redhat.com>
1 parent eb6bd01 commit 86ba489

3 files changed

Lines changed: 1 addition & 13 deletions

File tree

contrib/packaging/seal-uki

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ fi
4545
# Baseline container ukify options
4646
containerukifyargs=(--rootfs "${target}")
4747

48-
# WORKAROUND: SELinux must be permissive for sealed UKI boot
49-
# See https://github.com/bootc-dev/bootc/issues/1826
50-
containerukifyargs+=(--karg enforcing=0)
51-
5248
missing_verity=()
5349

5450
if [[ $allow_missing_verity == "true" ]]; then

crates/xtask/src/tmt.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ const ENV_BOOTC_UPGRADE_IMAGE: &str = "BOOTC_upgrade_image";
3131
// Distro identifiers
3232
const DISTRO_CENTOS_9: &str = "centos-9";
3333

34-
const COMPOSEFS_KERNEL_ARGS: [&str; 1] = ["--karg=enforcing=0"];
35-
3634
// Import the argument types from xtask.rs
37-
use crate::{BootType, Bootloader, RunTmtArgs, SealState, TmtProvisionArgs};
35+
use crate::{Bootloader, RunTmtArgs, SealState, TmtProvisionArgs};
3836

3937
/// Generate a random alphanumeric suffix for VM names
4038
fn generate_random_suffix() -> String {
@@ -488,11 +486,6 @@ pub(crate) fn run_tmt(sh: &Shell, args: &RunTmtArgs) -> Result<()> {
488486
let filesystem = args.filesystem.as_deref().unwrap_or("ext4");
489487
opts.push(format!("--filesystem={}", filesystem));
490488
opts.push("--composefs-backend".into());
491-
492-
// UKI install fails with extra args
493-
if args.boot_type == BootType::Bls {
494-
opts.extend(COMPOSEFS_KERNEL_ARGS.map(|x| x.into()));
495-
}
496489
}
497490

498491
if let Some(b) = &args.bootloader {

docs/src/experimental-composefs.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ The composefs backend is experimental; on-disk formats are subject to change.
159159
### Deployment blockers
160160

161161
- [Garbage collection](https://github.com/bootc-dev/bootc/pull/2040): In progress
162-
- [SELinux enforcement](https://github.com/bootc-dev/bootc/issues/1826): Currently requires `enforcing=0`
163162
- Extended install APIs: Ability to cleanly implement anaconda %post and osbuild post mutations and general post-install pre-reboot; right now some tools just mount the deployment directory (note this one also relates to [APIs in general](https://github.com/bootc-dev/bootc/issues/522))
164163
- [OCI registry install](https://github.com/bootc-dev/bootc/issues/1703): Installing from registry can fail due to config mismatch (suggestion: just clean reject v2s2)
165164
- [composefs-rs repository finalization](https://github.com/bootc-dev/bootc/issues/1320)

0 commit comments

Comments
 (0)