|
2 | 2 | //! |
3 | 3 | //! Create a merged filesystem tree with the image and mounted configmaps. |
4 | 4 |
|
| 5 | +use std::io::{BufRead, Write}; |
| 6 | + |
5 | 7 | use anyhow::Ok; |
6 | 8 | use anyhow::{Context, Result}; |
7 | 9 |
|
@@ -377,3 +379,127 @@ fn test_switch_inplace() -> Result<()> { |
377 | 379 | assert_eq!(replaced, target_deployment); |
378 | 380 | Ok(()) |
379 | 381 | } |
| 382 | + |
| 383 | +/// A workaround for https://github.com/ostreedev/ostree/issues/3193 |
| 384 | +/// as generated by anaconda. |
| 385 | +#[context("Updating /etc/fstab for anaconda+composefs")] |
| 386 | +pub(crate) fn fixup_etc_fstab(root: &Dir) -> Result<()> { |
| 387 | + let fstab_path = "etc/fstab"; |
| 388 | + // Read the old file |
| 389 | + let fd = root |
| 390 | + .open(fstab_path) |
| 391 | + .with_context(|| format!("Opening {fstab_path}")) |
| 392 | + .map(std::io::BufReader::new)?; |
| 393 | + |
| 394 | + // Helper function to possibly change a line from /etc/fstab. |
| 395 | + // Returns Ok(true) if we made a change (and we wrote the modified line) |
| 396 | + // otherwise returns Ok(false) and the caller should write the original line. |
| 397 | + fn edit_fstab_line(line: &str, mut w: impl Write) -> Result<bool> { |
| 398 | + if line.starts_with("#") { |
| 399 | + return Ok(false); |
| 400 | + } |
| 401 | + let parts = line.split_ascii_whitespace().collect::<Vec<_>>(); |
| 402 | + |
| 403 | + let path = parts.get(1); |
| 404 | + let options = parts.get(3); |
| 405 | + if let (Some(&path), Some(&options)) = (path, options) { |
| 406 | + let options = options.split(',').collect::<Vec<_>>(); |
| 407 | + if options.iter().any(|&s| s == "ro") { |
| 408 | + return Ok(false); |
| 409 | + } |
| 410 | + if path != "/" { |
| 411 | + return Ok(false); |
| 412 | + } |
| 413 | + } else { |
| 414 | + tracing::debug!("No path in entry: {line}"); |
| 415 | + return Ok(false); |
| 416 | + }; |
| 417 | + |
| 418 | + writeln!(w, "# {}", crate::generator::BOOTC_EDITED_STAMP)?; |
| 419 | + |
| 420 | + // SAFETY: we unpacked the options before. |
| 421 | + // This adds `ro` to the option list |
| 422 | + let options = format!("{},ro", options.unwrap()); |
| 423 | + for (i, part) in parts.into_iter().enumerate() { |
| 424 | + if i > 0 { |
| 425 | + write!(w, " ")?; |
| 426 | + } |
| 427 | + if i == 3 { |
| 428 | + write!(w, "{options}")?; |
| 429 | + } else { |
| 430 | + write!(w, "{part}")? |
| 431 | + } |
| 432 | + } |
| 433 | + writeln!(w)?; |
| 434 | + Ok(true) |
| 435 | + } |
| 436 | + |
| 437 | + // Read the input, and atomically write a modified version |
| 438 | + root.atomic_replace_with(fstab_path, move |mut w| { |
| 439 | + for line in fd.lines() { |
| 440 | + let line = line?; |
| 441 | + if !edit_fstab_line(&line, &mut w)? { |
| 442 | + writeln!(w, "{line}")?; |
| 443 | + } |
| 444 | + } |
| 445 | + Ok(()) |
| 446 | + }) |
| 447 | + .context("Replacing /etc/fstab")?; |
| 448 | + |
| 449 | + println!("Updated /etc/fstab to add `ro` for `/`"); |
| 450 | + Ok(()) |
| 451 | +} |
| 452 | + |
| 453 | +#[test] |
| 454 | +fn test_fixup_etc_fstab_default() -> Result<()> { |
| 455 | + let tempdir = cap_std_ext::cap_tempfile::tempdir(cap_std::ambient_authority())?; |
| 456 | + let default = "UUID=f7436547-20ac-43cb-aa2f-eac9632183f6 /boot auto ro 0 0\n"; |
| 457 | + tempdir.create_dir_all("etc")?; |
| 458 | + tempdir.atomic_write("etc/fstab", default)?; |
| 459 | + fixup_etc_fstab(&tempdir).unwrap(); |
| 460 | + assert_eq!(tempdir.read_to_string("etc/fstab")?, default); |
| 461 | + Ok(()) |
| 462 | +} |
| 463 | + |
| 464 | +#[test] |
| 465 | +fn test_fixup_etc_fstab_multi() -> Result<()> { |
| 466 | + let tempdir = cap_std_ext::cap_tempfile::tempdir(cap_std::ambient_authority())?; |
| 467 | + let default = "UUID=f7436547-20ac-43cb-aa2f-eac9632183f6 /boot auto ro 0 0\n\ |
| 468 | +UUID=6907-17CA /boot/efi vfat umask=0077,shortname=winnt 0 2\n"; |
| 469 | + tempdir.create_dir_all("etc")?; |
| 470 | + tempdir.atomic_write("etc/fstab", default)?; |
| 471 | + fixup_etc_fstab(&tempdir).unwrap(); |
| 472 | + assert_eq!(tempdir.read_to_string("etc/fstab")?, default); |
| 473 | + Ok(()) |
| 474 | +} |
| 475 | + |
| 476 | +#[test] |
| 477 | +fn test_fixup_etc_fstab_ro() -> Result<()> { |
| 478 | + let tempdir = cap_std_ext::cap_tempfile::tempdir(cap_std::ambient_authority())?; |
| 479 | + let default = "UUID=f7436547-20ac-43cb-aa2f-eac9632183f6 /boot auto ro 0 0\n\ |
| 480 | +UUID=1eef9f42-40e3-4bd8-ae20-e9f2325f8b52 / xfs ro 0 0\n\ |
| 481 | +UUID=6907-17CA /boot/efi vfat umask=0077,shortname=winnt 0 2\n"; |
| 482 | + tempdir.create_dir_all("etc")?; |
| 483 | + tempdir.atomic_write("etc/fstab", default)?; |
| 484 | + fixup_etc_fstab(&tempdir).unwrap(); |
| 485 | + assert_eq!(tempdir.read_to_string("etc/fstab")?, default); |
| 486 | + Ok(()) |
| 487 | +} |
| 488 | + |
| 489 | +#[test] |
| 490 | +fn test_fixup_etc_fstab_rw() -> Result<()> { |
| 491 | + let tempdir = cap_std_ext::cap_tempfile::tempdir(cap_std::ambient_authority())?; |
| 492 | + // This case uses `defaults` |
| 493 | + let default = "UUID=f7436547-20ac-43cb-aa2f-eac9632183f6 /boot auto ro 0 0\n\ |
| 494 | +UUID=1eef9f42-40e3-4bd8-ae20-e9f2325f8b52 / xfs defaults 0 0\n\ |
| 495 | +UUID=6907-17CA /boot/efi vfat umask=0077,shortname=winnt 0 2\n"; |
| 496 | + let modified = "UUID=f7436547-20ac-43cb-aa2f-eac9632183f6 /boot auto ro 0 0\n\ |
| 497 | +# Updated by bootc-fstab-edit.service\n\ |
| 498 | +UUID=1eef9f42-40e3-4bd8-ae20-e9f2325f8b52 / xfs defaults,ro 0 0\n\ |
| 499 | +UUID=6907-17CA /boot/efi vfat umask=0077,shortname=winnt 0 2\n"; |
| 500 | + tempdir.create_dir_all("etc")?; |
| 501 | + tempdir.atomic_write("etc/fstab", default)?; |
| 502 | + fixup_etc_fstab(&tempdir).unwrap(); |
| 503 | + assert_eq!(tempdir.read_to_string("etc/fstab")?, modified); |
| 504 | + Ok(()) |
| 505 | +} |
0 commit comments