Skip to content

Commit

Permalink
Merge pull request containers#318 from cgwalters/drop-immutable-bit-root
Browse files Browse the repository at this point in the history
install: Drop setting immutable bit on physical /
  • Loading branch information
cgwalters authored Feb 12, 2024
2 parents 2f2b313 + aa89956 commit d37f481
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
sudo grep foo=bar /boot/loader/entries/*.conf
grep authorized_keys /ostree/deploy/default/deploy/*/etc/tmpfiles.d/bootc-root-ssh.conf
# TODO fix https://github.com/containers/bootc/pull/137
sudo chattr -i / /ostree/deploy/default/deploy/*
sudo chattr -i /ostree/deploy/default/deploy/*
sudo rm /ostree/deploy/default -rf
sudo podman run --rm -ti --privileged --env BOOTC_SKIP_SELINUX_HOST_CHECK=1 --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
quay.io/centos-bootc/fedora-bootc-dev:eln bootc install to-filesystem \
Expand Down
7 changes: 0 additions & 7 deletions lib/src/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1012,13 +1012,6 @@ async fn install_to_filesystem_impl(state: &State, rootfs: &mut RootSetup) -> Re
crate::bootloader::install_via_bootupd(&rootfs.device, &rootfs.rootfs, &state.config_opts)?;
tracing::debug!("Installed bootloader");

// ostree likes to have the immutable bit on the physical sysroot to ensure
// that it doesn't accumulate junk; all system state should be in deployments.
Task::new("Setting root immutable bit", "chattr")
.cwd(&rootfs.rootfs_fd)?
.args(["+i", "."])
.run()?;

// Finalize mounted filesystems
if !rootfs.is_alongside {
let bootfs = rootfs.rootfs.join("boot");
Expand Down

0 comments on commit d37f481

Please sign in to comment.