split out OS release and SSH key info into separate service units #57
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jul 6, 2020
|
@rfairley Could you please rebase this PR against the latest master? |
added 10 commits
August 4, 2020 10:08
Split the definitions of {ETC,RUN,USR_LIB}_SNIPPETS into a .defs
file, aligning closer with issuegen and thinning out the motdgen
script. Prep for splitting out other parts of motdgen such as
the OS release info snippet.
This file need not be executable as it is only sourced into scripts and not directly executed. Move out of `usr/libexec` and into `usr/lib`. Update permission bits to be non-executable, and while at it fix the shebang to use the full path (as RPM will mangle the symlinked path to use the fully qualified path). also unset its executable bit, as this file is only sourced, and remove set bash flags and fix its shebang
Further align issuegen.defs with motdgen.defs by sourcing environment variables from `usr/lib/libutil.sh` and de-capitalizing local variables.
…essages Install files under /usr/lib/console-login-helper-messages which includes definitions and utility scripts, sourced by executables.
Split out the SSH key snippet generation into a single-purpose script run by its own unit. The unit runs only once per boot on startup, after `ssh-keygen.target` is met, which is the same refresh mechanism as originally guaranteed by issuegen. SSH keys should not be changed for a machine, and so regenerating the keys once on boot should be sufficient. Overall, this decouples extra work issuegen does if it was triggered for another reason (e.g. the udev rule for network interfaces); the SSH key info snippet need not be regenerated.
Similar as done for SSH keys in issuegen, split out the OS release generation into its own script and unit. The info shown from the OS release file need only be regenerated once on boot, as this information is not expected to change.
Give additional explanation on how the "gensnippet" units, split out from issuegen/motdgen, fit into the overall picture. Add these units to the sections on enabling/disabling messages.
Update this script to activate the recently split out services on startup.
Each SSH invocation takes some time to connect to the VM - mitigate this by connecting fewer times and executing more commands within each `ssh` invocation. While at it, be more consistent with variable expansion and quoting.
Update this script to enable the split out OS release and SSH keys units.
kelvinfan001
force-pushed
the
split-services
branch
from
8f30cd1 to
912f0c9
Compare
kelvinfan001
reviewed
Aug 4, 2020
There was a problem hiding this comment.
LGTM. Tested the changes locally (using https://github.com/coreos/console-login-helper-messages/blob/master/README-devel.md#testing-changes-in-a-virtual-machine) and things seem to be working as expected.
|
Thanks for pushing this one through and rebasing! LGTM. |
kelvinfan001
added a commit
to coreos/fedora-coreos-config
that referenced
this pull request
Sep 8, 2020
Remove preset for CLHM-{issuegn,motdgen}.service since the `.path`
units are now the only triggers to run the `-issuegen.service` and
`-motdgen.service` units.
coreos/console-login-helper-messages#55
Add preset to enable `CLHM-gensnippet-os-release.service` and
`CLHM-gensnippet-ssh-keys.service` units. These are new units that
were split out from `issuegen.service` and `motdgen.service`, and
should be enabled by default.
coreos/console-login-helper-messages#57
This was added in the v0.19 release: https://github.com/coreos/console-login-helper-messages/releases/tag/v0.19
kelvinfan001
added a commit
to coreos/fedora-coreos-config
that referenced
this pull request
Sep 11, 2020
Remove preset for CLHM-{issuegn,motdgen}.service since the `.path`
units are now the only triggers to run the `-issuegen.service` and
`-motdgen.service` units.
coreos/console-login-helper-messages#55
Add preset to enable `CLHM-gensnippet-os-release.service` and
`CLHM-gensnippet-ssh-keys.service` units. These are new units that
were split out from `issuegen.service` and `motdgen.service`, and
should be enabled by default.
coreos/console-login-helper-messages#57
This was added in the v0.19 release: https://github.com/coreos/console-login-helper-messages/releases/tag/v0.19
kelvinfan001
added a commit
to coreos/fedora-coreos-config
that referenced
this pull request
Sep 11, 2020
Remove preset for CLHM-{issuegn,motdgen}.service since the `.path`
units are now the only triggers to run the `-issuegen.service` and
`-motdgen.service` units.
coreos/console-login-helper-messages#55
Add preset to enable `CLHM-gensnippet-os-release.service` and
`CLHM-gensnippet-ssh-keys.service` units. These are new units that
were split out from `issuegen.service` and `motdgen.service`, and
should be enabled by default.
coreos/console-login-helper-messages#57
This was added in the v0.19 release: https://github.com/coreos/console-login-helper-messages/releases/tag/v0.19
kelvinfan001
added a commit
to coreos/fedora-coreos-config
that referenced
this pull request
Jan 7, 2021
Remove preset for CLHM-{issuegn,motdgen}.service since the `.path`
units are now the only triggers to run the `-issuegen.service` and
`-motdgen.service` units.
coreos/console-login-helper-messages#55
Add preset to enable `CLHM-gensnippet-os-release.service` and
`CLHM-gensnippet-ssh-keys.service` units. These are new units that
were split out from `issuegen.service` and `motdgen.service`, and
should be enabled by default.
coreos/console-login-helper-messages#57
This was added in the v0.19 release: https://github.com/coreos/console-login-helper-messages/releases/tag/v0.19
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following on #56 and #44, split out
console-login-helper-messages-gensnippet-os-release.serviceandconsole-login-helper-messages-gensnippet-ssh-keys.serviceinto separate units which use thePathChanged=/PathExistsGlob=detection provided by the.pathunits. These services run once on boot (which had been the case when they were part of the-issuegenand-motdgenscripts..defsfiles are also moved tousr/lib/console-login-helper-messagesas these are non-executable. Docs and development scripts are updated accordingly.