mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-08 19:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

coreos-base/coreos-init: run update-ssh-keys once after Ignition

Browse Source 
This pulls in
https://github.com/flatcar-linux/init/pull/66
to fix the problem that Ignition keys would be lost as soon as
update-ssh-keys runs. This is done by placing Ignition's keys in as
files in the authorized_keys.d folder and calling update-ssh-keys after
Ignition ran.
This commit is contained in:
Kai Lueke 2022-04-01 16:35:44 +02:00
parent 3b9a531252
commit 5bc2d57025
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-04-01-preserve-ignition-keys.md vendored Normal file
View File

@ -0,0 +1 @@
- Made Ignition write the SSH keys into a file under `authorized_keys.d/ignition` again and added a call to `update-ssh-keys` after Ignition ran to create the merged `authorized_keys` file, which fixes the problem that keys added by Ignition get lost when `update-ssh-keys` runs ([PR#66](https://github.com/flatcar-linux/init/pull/66))

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="a22b550c7cf689661970a2a23dd457870dd84c97" # flatcar-master CROS_WORKON_COMMIT="d76453b957f1e9ebe428c66ea6c9e3bb9a2d3489" # flatcar-master
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi

0
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.13.0.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.13.0-r1.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild vendored
View File

@ -46,7 +46,7 @@ PATCHES=(
src_compile() { src_compile() {
export GO15VENDOREXPERIMENT="1" export GO15VENDOREXPERIMENT="1"
GO_LDFLAGS="-X github.com/flatcar-linux/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar-linux/ignition/v2/internal/distro.selinuxRelabel=false -X github.com/flatcar-linux/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false" || die GO_LDFLAGS="-X github.com/flatcar-linux/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar-linux/ignition/v2/internal/distro.selinuxRelabel=false" || die
go_build "${COREOS_GO_PACKAGE}/internal" go_build "${COREOS_GO_PACKAGE}/internal"
} }