Skip to content

Commit

Permalink
coreos-base/update_engine: Ensure /etc/extensions is mergable
Browse files Browse the repository at this point in the history
This pulls in
flatcar/update_engine#32
to make the Docker/containerd sysexts show up when updating from Beta
3760.1.0.
  • Loading branch information
pothos committed Nov 29, 2023
1 parent a65df25 commit c5efd88
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog/bugfixes/2023-11-27-etc-extensions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fixed the missing `/etc/extensions/` symlinks for the inbuilt Docker/containerd systemd-sysext images on update from Beta 3760.1.0 ([update_engine#32](https://github.com/flatcar/update_engine/pull/32))
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="d262b46e4c0595e6cefa726a19b8b8c1cdf167a5" # flatcar-master
CROS_WORKON_COMMIT="a9b9beec3dbb5aac105fb73e68c3cead23a2236c" # flatcar-master
KEYWORDS="amd64 arm64"
fi

Expand Down

0 comments on commit c5efd88

Please sign in to comment.