Skip to content

generator: skip fstab editor for read-only root #2615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cgwalters merged 1 commit into from
Nov 2, 2026
Merged

generator: skip fstab editor for read-only root #2615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion crates/lib/src/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ pub(crate) fn fstab_generator_impl(root: &Dir, unit_dir: &Dir) -> Result<bool> {
.map(std::io::BufReader::new)
{
let mut from_anaconda = false;
let mut root_is_readonly = false;
for line in fd.lines() {
let line = line.context("Reading /etc/fstab")?;
if line.contains(BOOTC_EDITED_STAMP) {
Expand All @@ -48,8 +49,17 @@ pub(crate) fn fstab_generator_impl(root: &Dir, unit_dir: &Dir) -> Result<bool> {
if line.contains(FSTAB_ANACONDA_STAMP) {
from_anaconda = true;
}
let fields = line.split_ascii_whitespace().collect::<Vec<_>>();
if !line.trim_start().starts_with('#')
&& fields.get(1) == Some(&"/")
&& fields
.get(3)
.is_some_and(|options| options.split(',').any(|option| option == "ro"))
{
root_is_readonly = true;
}
}
if !from_anaconda {
if !from_anaconda || root_is_readonly {
return Ok(false);
}
tracing::debug!("/etc/fstab from anaconda: {from_anaconda}");
Expand Down Expand Up @@ -609,6 +619,24 @@ UUID=341c4712-54e8-4839-8020-d94073b1dc8b /boot xfs defaul
Ok(())
}

#[test]
fn test_generator_fstab_readonly_root() -> Result<()> {
let anaconda_fstab = indoc::indoc! { "
# Created by anaconda
UUID=715be2b7-c458-49f2-acec-b2fdb53d9089 / xfs defaults,ro 0 0
" };
let tempdir = fixture()?;
let unit_dir = &tempdir.open_dir("run/systemd/system")?;

tempdir.atomic_write("etc/fstab", anaconda_fstab)?;
tempdir.atomic_write(OSTREE_BOOTED, "ostree booted")?;
let updated = fstab_generator_impl(&tempdir, unit_dir)?;
assert!(!updated);
assert_eq!(unit_dir.entries()?.count(), 0);

Ok(())
}

#[test]
fn test_tmpfiles_ordering_dropin() -> Result<()> {
let tempdir = fixture()?;
Expand Down
Loading