Skip to content

Commit 230020c

Browse files
authored
Merge pull request #1427 from flatcar/kai/overlay-opaque-dirs
coreos-base/update_engine: Ensure /etc/extensions is mergable
2 parents 29c3227 + 0735fcb commit 230020c

File tree

3 files changed

+2
-1
lines changed

3 files changed

+2
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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))

sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com"
88
if [[ "${PV}" == 9999 ]]; then
99
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
1010
else
11-
CROS_WORKON_COMMIT="d262b46e4c0595e6cefa726a19b8b8c1cdf167a5" # flatcar-master
11+
CROS_WORKON_COMMIT="a9b9beec3dbb5aac105fb73e68c3cead23a2236c" # flatcar-master
1212
KEYWORDS="amd64 arm64"
1313
fi
1414

0 commit comments

Comments
 (0)