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.

Sign up for GitHub

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

Jump to bottom

Miscellaneous patches split out of #2155 #2172

Merged
merged 6 commits into from
Aug 17, 2020
Merged

Miscellaneous patches split out of #2155 #2172

merged 6 commits into from
Aug 17, 2020

Commits on Aug 17, 2020

  1. lib/deploy: Clean up kargs override handling 

    Tighten up how we handle kargs here so it's more clear. When we call
`sysroot_finalize_deployment`, any karg overrides have already been set
on the bootconfig object of the deployment. So re-setting it here is
redundant and confusing.
    @jlebon
    jlebon committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    52a6224 View commit details
    Browse the repository at this point in the history

  2. lib/deploy: Avoid shadowing variable 

    There's already a `boot_relpath` variable in the outside scope.
    @jlebon
    jlebon committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    61c544d View commit details
    Browse the repository at this point in the history

  3. lib/deploy: Simplify deployment creation 

    Minor cleanup; we were declaring a superfluous variable.
    @jlebon
    jlebon committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    74bd136 View commit details
    Browse the repository at this point in the history

  4. lib/cleanup: Drop unnecessary GEqualFunc cast

    @jlebon
    jlebon committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    e4fb7d3 View commit details
    Browse the repository at this point in the history

  5. lib/deploy: Drop unneccessary function arg

    @jlebon
    jlebon committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    5de3a97 View commit details
    Browse the repository at this point in the history

  6. lib/deploy: Clarify comment re. staging API 

    Don't mention deprecation in the description for
`ostree_sysroot_deploy_tree` since there are legitimate use cases for it
(e.g. to create the first deployment via `ostree admin deploy`).

Instead, make the comment clearly redirect to the staging API when
booted into the sysroot.
    @jlebon
    jlebon committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    10a68cd View commit details
    Browse the repository at this point in the history