Skip to content

Sync to ubuntu/main#152

Closed
mikeraymond7 wants to merge 22 commits intoubuntu/mainfrom
main
Closed

Sync to ubuntu/main#152
mikeraymond7 wants to merge 22 commits intoubuntu/mainfrom
main

Conversation

@mikeraymond7
Copy link
Copy Markdown
Contributor

Syncing main branch to ubuntu/main before adding systemd service needed to complete the nullboot fallback mechanism. This includes a number of version bumps alongside the addition of the nullboot fallback mechanism.

dependabot bot and others added 22 commits March 6, 2025 12:10
Bumps [github.com/spf13/afero](https://github.com/spf13/afero) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/spf13/afero/releases)
- [Commits](spf13/afero@v1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/afero
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.21.0 to 0.28.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.21.0...v0.28.0)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-version: 0.28.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v3...v4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.30.0 to 0.37.0.
- [Commits](golang/sys@v0.30.0...v0.37.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-version: 0.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.32.0 to 0.45.0.
- [Commits](golang/crypto@v0.32.0...v0.45.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.45.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/spf13/afero](https://github.com/spf13/afero) from 1.12.0 to 1.15.0.
- [Release notes](https://github.com/spf13/afero/releases)
- [Commits](spf13/afero@v1.12.0...v1.15.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/afero
  dependency-version: 1.15.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.31.0 to 0.34.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.31.0...v0.34.0)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
To allow more malleable operations with the status of various boot
variables, we can now find, create, and set BootEntryVariable(s) as
individual operations; in some circumstances, a BootEntryVariable not
existing is a sign of a serious error and should be handled as such.
Working to implement the kernel fallback mechanism, the status of
BootCurrent is needed to determine whether the bootloader is up to date,
or if a fallback may have occurred.
The introduction of the new constructor allows for easier testing and
creation of consistent BootEntry variables.
CommitToBootLoader previously leveraged FindOrCreate to generate the EFI
variables for each kernel entry. However, with the incoming changes to
set a kernel fallback mechanism, these EFI variables must be present
before this point. Seeing as these entries are already considered
trusted and have been measured before this point, there is no change in
behavior in this commit.
Introduce fallback mechanism for potentially flawed kernel entries.
This method allows kernels to be booted before amending the persistent
BootOrder EFI variable. Instead of potentially adding a faulty kernel
entry to the BootOrder, BootNext can be used. If the kernel entry boots,
then the BootOrder and bootloader can be amended. If it does not boot,
then the previous BootOrder will continue to boot. After BootNext is set
and the system reboots, BootNext is automatically deleted by UEFI.
To follow the introduction of the fallback mechanism, this change allows
for a query on the state of the bootloader. i.e. if the fallback
mechanism is enabled and a new kernel boots, the BootOrder EFI variable
and the rest of the bootloader can be amended. Otherwise, if the
BootCurrent EFI variable is the first boot entry in the BootOrder, no
changes are needed.
This change enables the kernel fallback mechanism as it relates to new
kernels via `nullbootctl`. The new CLI flag disables the setting of
BootNext such that an unsuccessful boot onto BootNext does not result
in the continued setting of BootNext. Rather, the installation trigger
will set BootNext and the systemd service executed on startup will not.

Default behavior is to implement the fallback mechanism, and a successful
boot onto that kernel will amend the boot loader. Unsuccessful boots
will not amend the boot loader or set BootNext again until another apt
event triggers `nullbootctl` again.
This is adding a Kernel and KernelEntry type to better manage the flow
of kernel information throughout the program. This also makes it simpler
to assert the order on kernel version when necessary by having a
consistent way to easily sort the kernels. GetLatestKernelEntry() was
updated to have a more reliable way to determine the latest kernel entry
rather than assuming the first kernel entry is latest based on
`readKernel`. A test was added to ensure this behavior is correct.
The test previously did not account for exact BootEntryVariables at the
end, so this is ensuring the output is precisely as expected and
clarifies a few pieces of the test, like the pre-generation step and the
rationale behind the expected values.
BootCurrent, BootNext, and BootOrder are constantly referenced in string
format. This simplifies that process to limit potential errors in
repeatedly typing out the names.
Added a kernel fallback mechanism for new kernel installations such that
new kernels boot via BootNext instead of being the first entry in the
persistent BootOrder. BootNext is used and then automatically deleted by
UEFI upon each boot, meaning that if BootNext fails to boot, the
bootloader will fallback to the BootOrder, and resume normal operations.
Tested with the unit tests in the repository as well as the tests
pending acceptance in ubuntu-boot-test (see
https://warthogs.atlassian.net/browse/CPC-9074 for more information)
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.31.0 to
0.34.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/golang/text/commit/817fba9abd337b4d9097b10c61a540c74feaaeff"><code>817fba9</code></a>
go.mod: update golang.org/x dependencies</li>
<li><a
href="https://github.com/golang/text/commit/3264de9174be11be843825a6dae979beffb483a2"><code>3264de9</code></a>
all: clean up old Go hacks</li>
<li><a
href="https://github.com/golang/text/commit/74af29835a6da65bf18d985619fa645e04a01549"><code>74af298</code></a>
all: fix tags in remaining Unicode tables</li>
<li><a
href="https://github.com/golang/text/commit/117e03b3060d70a9f514eef78f07e5210cc44a4c"><code>117e03b</code></a>
all: delete old Unicode tables</li>
<li><a
href="https://github.com/golang/text/commit/9463ea4393e969a59c7a0af1b497b4361ff1dc52"><code>9463ea4</code></a>
all: update to Unicode 17</li>
<li><a
href="https://github.com/golang/text/commit/7278b25aaff94e106b7de0bfaaa4a1861d3b3c89"><code>7278b25</code></a>
internal/export/idna: update for post-Unicode 10 idna changes</li>
<li><a
href="https://github.com/golang/text/commit/f964ad80f9e4185588298009b5195d8ecfe34d1b"><code>f964ad8</code></a>
internal/export/idna: delete old code</li>
<li><a
href="https://github.com/golang/text/commit/678d34e5c1bfbefd51bbd8e6a639744c36be73fd"><code>678d34e</code></a>
unicode/norm: preserve QC Maybe bit in packed forminfo</li>
<li><a
href="https://github.com/golang/text/commit/536231a9abc69feaab8d726b5ec75ee8d3620829"><code>536231a</code></a>
go.mod: update golang.org/x dependencies</li>
<li><a
href="https://github.com/golang/text/commit/0dd57a6ef90c283b902525213f15d6b2a59cc84b"><code>0dd57a6</code></a>
go.mod: update golang.org/x dependencies</li>
<li>Additional commits viewable in <a
href="https://github.com/golang/text/compare/v0.31.0...v0.34.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/text&package-manager=go_modules&previous-version=0.31.0&new-version=0.34.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
[//]: # (dependabot-start)
⚠️  **Dependabot is rebasing this PR** ⚠️ 

Rebasing might not happen immediately, so don't worry if this takes some
time.

Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.

---

[//]: # (dependabot-end)

Bumps [github.com/spf13/afero](https://github.com/spf13/afero) from
1.12.0 to 1.15.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/spf13/afero/releases">github.com/spf13/afero's
releases</a>.</em></p>
<blockquote>
<h2>v1.15.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Bump golangci/golangci-lint-action from 6.5.1 to 6.5.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/479">spf13/afero#479</a></li>
<li>Lint by <a
href="https://github.com/sagikazarmark"><code>@​sagikazarmark</code></a>
in <a
href="https://redirect.github.com/spf13/afero/pull/492">spf13/afero#492</a></li>
<li>build(deps): bump github/codeql-action from 2.13.4 to 3.28.15 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/494">spf13/afero#494</a></li>
<li>build(deps): bump actions/dependency-review-action from 4.5.0 to
4.6.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/493">spf13/afero#493</a></li>
<li>Bump actions/setup-go from 5.3.0 to 5.4.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/480">spf13/afero#480</a></li>
<li>build(deps): bump github/codeql-action from 3.28.15 to 3.28.16 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/496">spf13/afero#496</a></li>
<li>support aliyun oss storage with third-party link by <a
href="https://github.com/messikiller"><code>@​messikiller</code></a> in
<a
href="https://redirect.github.com/spf13/afero/pull/491">spf13/afero#491</a></li>
<li>build(deps): bump github/codeql-action from 3.28.16 to 3.28.17 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/497">spf13/afero#497</a></li>
<li>chore: update x/test by <a
href="https://github.com/sagikazarmark"><code>@​sagikazarmark</code></a>
in <a
href="https://redirect.github.com/spf13/afero/pull/502">spf13/afero#502</a></li>
<li>build(deps): bump actions/setup-go from 5.4.0 to 5.5.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/503">spf13/afero#503</a></li>
<li>build(deps): bump actions/dependency-review-action from 4.6.0 to
4.7.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/505">spf13/afero#505</a></li>
<li>build(deps): bump github/codeql-action from 3.28.17 to 3.28.18 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/506">spf13/afero#506</a></li>
<li>fix(gcsfs): update object not exist check logic by <a
href="https://github.com/ahkui"><code>@​ahkui</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/485">spf13/afero#485</a></li>
<li>build(deps): bump ossf/scorecard-action from 2.4.1 to 2.4.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/508">spf13/afero#508</a></li>
<li>build(deps): bump github/codeql-action from 3.28.18 to 3.29.4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/519">spf13/afero#519</a></li>
<li>build(deps): bump github/codeql-action from 3.29.4 to 3.29.7 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/524">spf13/afero#524</a></li>
<li>build(deps): bump github/codeql-action from 3.29.7 to 3.30.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/537">spf13/afero#537</a></li>
<li>build(deps): bump actions/setup-go from 5.5.0 to 6.0.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/536">spf13/afero#536</a></li>
<li>build(deps): bump actions/dependency-review-action from 4.7.1 to
4.7.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/533">spf13/afero#533</a></li>
<li>build(deps): bump actions/checkout from 4.2.2 to 5.0.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/spf13/afero/pull/527">spf13/afero#527</a></li>
<li>chore: update deps by <a
href="https://github.com/sagikazarmark"><code>@​sagikazarmark</code></a>
in <a
href="https://redirect.github.com/spf13/afero/pull/538">spf13/afero#538</a></li>
<li>fix: spelling errors (excpected -&gt; expected, iself -&gt; itself)
by <a
href="https://github.com/MarkRosemaker"><code>@​MarkRosemaker</code></a>
in <a
href="https://redirect.github.com/spf13/afero/pull/523">spf13/afero#523</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/messikiller"><code>@​messikiller</code></a>
made their first contribution in <a
href="https://redirect.github.com/spf13/afero/pull/491">spf13/afero#491</a></li>
<li><a href="https://github.com/ahkui"><code>@​ahkui</code></a> made
their first contribution in <a
href="https://redirect.github.com/spf13/afero/pull/485">spf13/afero#485</a></li>
<li><a
href="https://github.com/MarkRosemaker"><code>@​MarkRosemaker</code></a>
made their first contribution in <a
href="https://redirect.github.com/spf13/afero/pull/523">spf13/afero#523</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/spf13/afero/compare/v1.14.0...v1.15.0">https://github.com/spf13/afero/compare/v1.14.0...v1.15.0</a></p>
<h2>v1.14.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Split gcsfs and sftpfs into separate modules by <a
href="https://github.com/sagikazarmark"><code>@​sagikazarmark</code></a>
in <a
href="https://redirect.github.com/spf13/afero/pull/462">spf13/afero#462</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/spf13/afero/compare/v1.13.0...v1.14.0">https://github.com/spf13/afero/compare/v1.13.0...v1.14.0</a></p>
<h2>v1.13.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Bump actions/setup-go from 5.2.0 to 5.3.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/446">spf13/afero#446</a></li>
<li>Bump golangci/golangci-lint-action from 6.1.1 to 6.3.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/451">spf13/afero#451</a></li>
<li>Bump golang.org/x/text from 0.21.0 to 0.22.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/452">spf13/afero#452</a></li>
<li>Bump golang.org/x/oauth2 from 0.25.0 to 0.26.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/453">spf13/afero#453</a></li>
<li>Bump golangci/golangci-lint-action from 6.3.0 to 6.3.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/459">spf13/afero#459</a></li>
<li>Bump golang.org/x/crypto from 0.32.0 to 0.33.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/455">spf13/afero#455</a></li>
<li>Bump golangci/golangci-lint-action from 6.3.3 to 6.5.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/460">spf13/afero#460</a></li>
<li>ci: add Go 1.24 to the test matrix by <a
href="https://github.com/sagikazarmark"><code>@​sagikazarmark</code></a>
in <a
href="https://redirect.github.com/spf13/afero/pull/461">spf13/afero#461</a></li>
<li>Bump golangci/golangci-lint-action from 6.5.0 to 6.5.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/spf13/afero/pull/473">spf13/afero#473</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/spf13/afero/commit/399bb34ad9fd8a252ad1d8bfaef96279b66dc774"><code>399bb34</code></a>
Merge pull request <a
href="https://redirect.github.com/spf13/afero/issues/523">#523</a> from
MarkRosemaker/fix-spelling</li>
<li><a
href="https://github.com/spf13/afero/commit/9b67716b675a40406678b57cefe0260699008630"><code>9b67716</code></a>
Merge pull request <a
href="https://redirect.github.com/spf13/afero/issues/538">#538</a> from
spf13/deps</li>
<li><a
href="https://github.com/spf13/afero/commit/f5f4f7bd6427212efca35481b3b8c749bbf06243"><code>f5f4f7b</code></a>
chore: update deps</li>
<li><a
href="https://github.com/spf13/afero/commit/c245c4fc3df2e427d681479553a625c5ef0e1eb8"><code>c245c4f</code></a>
ci: update ci</li>
<li><a
href="https://github.com/spf13/afero/commit/85c49563d6385bdc0d6873937d5a28c4a5c6f5e6"><code>85c4956</code></a>
Merge pull request <a
href="https://redirect.github.com/spf13/afero/issues/527">#527</a> from
spf13/dependabot/github_actions/actions/checkout...</li>
<li><a
href="https://github.com/spf13/afero/commit/41206fdfdacaad1dffaad870ded6f497ae1b803a"><code>41206fd</code></a>
build(deps): bump actions/checkout from 4.2.2 to 5.0.0</li>
<li><a
href="https://github.com/spf13/afero/commit/a583fade54a843a334e7595da81e287aa7adb63a"><code>a583fad</code></a>
Merge pull request <a
href="https://redirect.github.com/spf13/afero/issues/533">#533</a> from
spf13/dependabot/github_actions/actions/dependen...</li>
<li><a
href="https://github.com/spf13/afero/commit/673c03e4c1ba4512a26a91b42602f762a93647af"><code>673c03e</code></a>
Merge pull request <a
href="https://redirect.github.com/spf13/afero/issues/536">#536</a> from
spf13/dependabot/github_actions/actions/setup-go...</li>
<li><a
href="https://github.com/spf13/afero/commit/ac849f6a1820b81c052bf0a64e09fd10c8c7a3e0"><code>ac849f6</code></a>
Merge pull request <a
href="https://redirect.github.com/spf13/afero/issues/537">#537</a> from
spf13/dependabot/github_actions/github/codeql-ac...</li>
<li><a
href="https://github.com/spf13/afero/commit/9596fe84b763fd2e18267ac455a4cedba2655194"><code>9596fe8</code></a>
build(deps): bump github/codeql-action from 3.29.7 to 3.30.1</li>
<li>Additional commits viewable in <a
href="https://github.com/spf13/afero/compare/v1.12.0...v1.15.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/spf13/afero&package-manager=go_modules&previous-version=1.12.0&new-version=1.15.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
@coveralls
Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 23860974881

Details

  • 202 of 298 (67.79%) changed or added relevant lines in 5 files are covered.
  • 2 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.9%) to 70.807%

Changes Missing Coverage Covered Lines Changed/Added Lines %
efibootmgr/kernel.go 83 106 78.3%
cmd/nullbootctl/main.go 0 31 0.0%
efibootmgr/bootmgr.go 94 136 69.12%
Files with Coverage Reduction New Missed Lines %
cmd/nullbootctl/main.go 1 0.0%
efibootmgr/bootmgr.go 1 75.65%
Totals Coverage Status
Change from base Build 23059870531: -0.9%
Covered Lines: 912
Relevant Lines: 1288

💛 - Coveralls

@julian-klode
Copy link
Copy Markdown
Contributor

Sorry this isn't going to work. Let me tag a release and merge it into the branch otherwise things get a bit mad.

@mikeraymond7
Copy link
Copy Markdown
Contributor Author

Sorry this isn't going to work. Let me tag a release and merge it into the branch otherwise things get a bit mad.

@julian-klode We need to add a systemd service to the ubuntu/main branch that will be a part of this fallback mechanism. The service will use the new flag I introduced here. How do we get these changes up to ubuntu/main while also adding the systemd service as part of the same release version?

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.

4 participants