Skip to content

osbuild: drop /dev/udev osbuild workaround#4570

Draft
jbtrystram wants to merge 1 commit into
coreos:mainfrom
jbtrystram:drop-osbuild-lsblk-workaround
Draft

osbuild: drop /dev/udev osbuild workaround#4570
jbtrystram wants to merge 1 commit into
coreos:mainfrom
jbtrystram:drop-osbuild-lsblk-workaround

Conversation

@jbtrystram

Copy link
Copy Markdown
Member

The underlying cause of this was fixed in bootc 1.15.2 [1]

[1] bootc-dev/bootc#2169


This is a draft until we get the next bootupd release : coreos/bootupd#1103

The underlying cause of this was fixed in bootc 1.15.2 [1]

[1] bootc-dev/bootc#2169
@openshift-ci

openshift-ci Bot commented Jun 4, 2026

Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request removes a patch file and disables the patching mechanism in build.sh by returning early and commenting out the patching logic. The reviewer suggested completely removing the commented-out code block in build.sh instead of leaving it commented out, which would keep the script cleaner and more maintainable.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread build.sh
Comment on lines +185 to +205
return # No patches at this time
# # Add a few patches that either haven't made it into a release or
# # that will be obsoleted with other work that will be done soon.
# #
# # To make it easier to apply patches we'll move around the osbuild
# # code on the system first:
# rmdir /usr/lib/osbuild/osbuild
# python_lib_dir=$(ls -d /usr/lib/python*)
# mv "${python_lib_dir}/site-packages/osbuild" /usr/lib/osbuild/
# mkdir -p /usr/lib/osbuild/tools
# mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
# # Now all the software is under the /usr/lib/osbuild dir and we can patch
# # shellcheck disable=SC2002
# cat \
# /usr/lib/coreos-assembler/0003-buildroot-bind-mount-run-udev-for-partition-discovery.patch \
# | patch -d /usr/lib/osbuild -p1
# # And then move the files back; supermin appliance creation will need it back
# # in the places delivered by the RPM.
# mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
# mv /usr/lib/osbuild/osbuild "${python_lib_dir}/site-packages/osbuild"
# mkdir -p /usr/lib/osbuild/osbuild

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Instead of leaving a large block of commented-out code, it is better to completely remove it to keep the script clean and maintainable.

Suggested change
return # No patches at this time
# # Add a few patches that either haven't made it into a release or
# # that will be obsoleted with other work that will be done soon.
# #
# # To make it easier to apply patches we'll move around the osbuild
# # code on the system first:
# rmdir /usr/lib/osbuild/osbuild
# python_lib_dir=$(ls -d /usr/lib/python*)
# mv "${python_lib_dir}/site-packages/osbuild" /usr/lib/osbuild/
# mkdir -p /usr/lib/osbuild/tools
# mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
# # Now all the software is under the /usr/lib/osbuild dir and we can patch
# # shellcheck disable=SC2002
# cat \
# /usr/lib/coreos-assembler/0003-buildroot-bind-mount-run-udev-for-partition-discovery.patch \
# | patch -d /usr/lib/osbuild -p1
# # And then move the files back; supermin appliance creation will need it back
# # in the places delivered by the RPM.
# mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
# mv /usr/lib/osbuild/osbuild "${python_lib_dir}/site-packages/osbuild"
# mkdir -p /usr/lib/osbuild/osbuild
# No patches at this time
return 0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant