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

Merge pull request #1794 from flatcar-linux/kai/update-ssh-keys-after-ignition

Browse Source 
coreos-base/coreos-init: run update-ssh-keys once after Ignition
This commit is contained in:
Kai Lüke 2022-04-04 20:35:25 +02:00 committed by GitHub
commit fbcc7639e8
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
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="a22b550c7cf689661970a2a23dd457870dd84c97" # flatcar-master
CROS_WORKON_COMMIT="d76453b957f1e9ebe428c66ea6c9e3bb9a2d3489" # flatcar-master
KEYWORDS="amd64 arm arm64 x86"
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() {
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"
}