Uboot fallback support #1138
Closed
Uboot fallback support #1138
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch?
|
|
bot, add author to whitelist |
cgwalters
reviewed
Sep 6, 2017
| uenv_path = glnx_strjoina (ostree_arg, "/usr/lib/ostree-boot/uEnv.txt"); | ||
| uenv_fd = openat (self->sysroot->sysroot_fd, uenv_path, O_CLOEXEC | O_RDONLY); | ||
| if (uenv_fd != -1) | ||
| { |
There was a problem hiding this comment.
Indentation looks off; we use GNU style, two spaces around braces on each side.
cgwalters
reviewed
Sep 7, 2017
| return FALSE; | ||
| if (errno != ENOENT) | ||
| { | ||
| g_prefix_error (error, "openat %s: ", uenv_path); |
There was a problem hiding this comment.
These two lines need to be return glnx_throw_errno_prefix (error, "openat(%s)", uenv_path).
There was a problem hiding this comment.
OK, that wasn't a new issue in this patch. I fixed it up though anyways. Thanks for the work on this!
cgwalters
force-pushed
the
uboot-fallback
branch
from
04e6939
to
ed0e45b
Compare
added 2 commits
September 7, 2017 15:13
Split the code that merge the system uEnv to new function. While we're here, clean up the logic to e.g. use `ot_openat_ignore_enoent()`.
Include non-default deployments in the uEnv.txt file imported by U-Boot. All the configurations beside the defaults will have numerical suffix E.G. "kernel_image2" or "bootargs2". Those U-Boot environment variables may be used from interactive boot prompt or from "altbootcmd" script.
cgwalters
force-pushed
the
uboot-fallback
branch
from
ed0e45b
to
7ff4394
Compare
rh-atomic-bot
pushed a commit
that referenced
this pull request
Sep 7, 2017
Split the code that merge the system uEnv to new function. While we're here, clean up the logic to e.g. use `ot_openat_ignore_enoent()`. Closes: #1138 Approved by: cgwalters
rh-atomic-bot
pushed a commit
that referenced
this pull request
Sep 7, 2017
Include non-default deployments in the uEnv.txt file imported by U-Boot. All the configurations beside the defaults will have numerical suffix E.G. "kernel_image2" or "bootargs2". Those U-Boot environment variables may be used from interactive boot prompt or from "altbootcmd" script. Closes: #1138 Approved by: cgwalters
|
💔 Test failed - status-atomicjenkins |
Hmm...at first I thought I'd broken this but can't reproduce locally. @rh-atomic-bot retry |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Sep 8, 2017
Include non-default deployments in the uEnv.txt file imported by U-Boot. All the configurations beside the defaults will have numerical suffix E.G. "kernel_image2" or "bootargs2". Those U-Boot environment variables may be used from interactive boot prompt or from "altbootcmd" script. Closes: #1138 Approved by: cgwalters
|
☀️ Test successful - status-atomicjenkins |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As promised on the mailing list, here is my attempt to add fallback support for U-Boot users.
The first commit is a general cleanup, the second is the actual change.