Skip to content
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.

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

sys-apps/ignition: Use new upstream patch #1403

Closed
wants to merge 2 commits into from
Closed

Conversation

pothos
Copy link
Member

@pothos pothos commented Nov 20, 2023

The patch was reworked to use partx which already is in the initrd and to have safety checks for disks in use.

How to use

Wait for the upstream PR to be merged. Then resync and drop partprobe from bootengine (flatcar/bootengine#80) and update the commit here to the git merge commit ref.

Testing done

Tested three cases, the overwriting of USR-A was detected and an error thrown, the other two changes passed without problem because the USR-B is unused and can be overwritten and the new partition is also ok to add (confirmed with lsblk that the kernel has the updated values thanks to partx):

variant: flatcar
version: 1.0.0
storage:
  disks:
  - device: /dev/vda
    partitions:
    - label: USR-A
      number: 3
      size_mib: 1
      resize: true
variant: flatcar
version: 1.0.0
storage:
  disks:
  - device: /dev/vda
    partitions:
    - label: USR-B
      number: 4
      size_mib: 1
      resize: true
variant: flatcar
version: 1.0.0
storage:
  disks:
  - device: /dev/vda
    partitions:
    - label: VAR
      number: 10
      size_mib: 1
  filesystems:
  - device: /dev/disk/by-partlabel/VAR
    format: vfat
    path: /var
    label: VAR
    with_mount_unit: true
  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)
  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

Copy link

github-actions bot commented Nov 21, 2023

@pothos pothos force-pushed the kai/ignition-new-patch branch from cf70f17 to ccb2dd7 Compare November 22, 2023 12:24
@pothos pothos force-pushed the kai/ignition-new-patch branch from ccb2dd7 to 14c858f Compare November 22, 2023 16:37
@pothos pothos force-pushed the kai/ignition-new-patch branch from 14c858f to ee8b4b8 Compare December 15, 2023 16:59
@pothos pothos force-pushed the kai/ignition-new-patch branch from ee8b4b8 to c549ad3 Compare December 15, 2023 17:06
@pothos pothos force-pushed the kai/ignition-new-patch branch from c549ad3 to 3d8e145 Compare December 18, 2023 11:48
@pothos pothos force-pushed the kai/ignition-new-patch branch from 3d8e145 to 5b82105 Compare December 18, 2023 17:19
pothos added a commit to flatcar/bootengine that referenced this pull request Dec 18, 2023
Partx is already present, but not explicitly mentioned. We can use it
instead of partprobe when adapting the Ignition patch in
flatcar/scripts#1403
pothos added a commit to flatcar/bootengine that referenced this pull request May 6, 2024
Partx is already present, but not explicitly mentioned. We can use it
instead of partprobe when adapting the Ignition patch in
flatcar/scripts#1403
@pothos pothos force-pushed the kai/ignition-new-patch branch from dd68a06 to c74d45e Compare May 6, 2024 13:37
@pothos pothos temporarily deployed to development May 6, 2024 13:37 — with GitHub Actions Inactive
This pulls in flatcar/bootengine#80
to use partx instead of partprobe.
@pothos pothos force-pushed the kai/ignition-new-patch branch from c74d45e to 104031b Compare May 7, 2024 04:36
@pothos pothos temporarily deployed to development May 7, 2024 04:36 — with GitHub Actions Inactive
The patch was reworked to use partx which already is in the initrd and
to have safety checks for disks in use.
@pothos pothos force-pushed the kai/ignition-new-patch branch from 104031b to d2694e8 Compare May 7, 2024 06:23
@pothos pothos temporarily deployed to development May 7, 2024 06:23 — with GitHub Actions Inactive
@tormath1
Copy link
Contributor

This has been merged upstream and it will be pulled in the next Ignition upgrade. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants