sysroot: Support customising /boot on root for syslinux and u-boot #2145
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
I think this may affect bindings too.
In preparation for enhancing `_ostree_sysroot_query_bootloader`
It's easier to extend and it centralises the config parsing. In other places we will no longer need to use `g_str_equal` to match these values, a `switch` statement will be sufficient.
...with the `sysroot.bootloader` configuration option. This can be useful when converting a system to use `ostree` which doesn't currently have a bootloader configuration that `ostree` can automatically detect, and is also useful in combination with the `--sysroot` option when provisioning a rootfs for systems other than the one you're running `ostree admin deploy` on.
In preparation for adding another function that will need these `AUTOPTR_CLEANUP_FUNC`s.
This introduces a new config value "sysroot.boot_path_on_disk": > Tell ostree where the bootloader will be looking for the kernel. This is > the location of `/boot` relative to the root of the boot partition. > > This allows explicitly telling ostree that the boot partition is or is > not separate from the root partition. If `/boot` is on root set this to > `/boot`. If it's on seperate partition this should be set to `/`. > > This must be either an absolute path (starting with `/`) or `auto`. > Defaults to `auto`. > > This setting currently only respected by the u-boot and syslinux > bootloaders. This commit is based on an original by Colin Walters (ostreedev#215), but takes a different tack. ostreedev#215 attempts to determine automatically whether `/boot` is on root or not, but there are always situations where this isn't possible so I'm adding a config option here so the user can make it explicit. Future commits can add the automatic detection in, but this means that we don't need to be completely general with the auto-detection.
This speeds up iterating on fixing code.
|
Actually, nevermind this I've got a better solution... |
|
I know this is a lot more code but I do like the explicit-ness of this. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, wmanley The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
cgwalters
reviewed
Jul 23, 2020
| @@ -372,6 +372,33 @@ Boston, MA 02111-1307, USA. | |||
| </listitem> | |||
| </varlistentry> | |||
|
|
|||
| <varlistentry> | |||
| <term><varname>boot_path_on_disk</varname></term> | |||
|
|
||
| if (!boot_path_on_disk || boot_path_on_disk[0] != '/') | ||
| { | ||
| g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "sysroot.boot_path_on_disk " |
There was a problem hiding this comment.
I'd do:
return glnx_null_throw ("sysroot.boot_path is not absolute: %s", boot_path);
|
Closing this since #2149 merged. |
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.
This introduces a new config value "sysroot.boot_path_on_disk":
This commit is based on an original by Colin Walters (#215), but takes a
different tack. #215 attempts to determine automatically whether
/bootis on root or not, but there are always situations where this isn't
possible so I'm adding a config option here so the user can make it
explicit.
Future commits can add the automatic detection in, but this means that we
don't need to be completely general with the auto-detection.
See also some background here: #1404 (comment)